Marius Vollmer
4c9659405b
Hightlight current item.
...
* magit.el (magit-put-line-property): Don't use line-end-position, use
line-beginning-position of next line instead.
2008-08-20 00:58:34 +03:00
Marius Vollmer
b1a3cf9a07
Remove outdated comment.
2008-08-20 00:56:11 +03:00
Marius Vollmer
9189074037
Removed "-face" suffix from face names.
...
As recommended by the Elisp Manual.
2008-08-20 00:55:42 +03:00
Marius Vollmer
e227560477
Faces.
...
From Linh Dang.
2008-08-19 23:43:34 +03:00
Marius Vollmer
79239e3ae2
Updated TODO.
2008-08-19 02:06:17 +03:00
Marius Vollmer
5e6ac7730e
Move with n and p, like God intended.
...
* magit.el (magit-mode-map): Put magit-next-section and
magit-previous-section on 'n' and 'p', respectively. Put
magit-display-process on '$'.
2008-08-19 02:06:08 +03:00
Marius Vollmer
a72d0ceec1
Added lost key bindings.
...
* magit.el (magit-mode-map): Added bindings for 'a' magit-apply-commit
and 'v' magit-revert-commit.
2008-08-19 01:34:38 +03:00
Marius Vollmer
601d26bf5a
Use named functions for the section jumpers so that the online help
...
has something to show.
2008-08-19 00:42:44 +03:00
Marius Vollmer
4b3fcac93f
Better movement.
...
* magit.el (magit-next-section, magit-previous-section,
magit-section-jumper): New.
(magit-put-line-property): Include newline.
(magit-mode-map): Don't bind digits by default. Bind M-n and M-p to
move by sections, and 0, 1, 2, 4 to jump directly to a section
2008-08-18 23:51:26 +03:00
Marius Vollmer
5a19dcbd8d
Removed docstring of magit-mode, it's quite wrong now.
2008-08-18 23:13:16 +03:00
Marius Vollmer
b7c1292701
Always use "git cmd" instead of "git-cmd".
...
The latter was deprecated and doesn't work anymore in git 1.6.
2008-08-18 22:07:00 +03:00
Marius Vollmer
edc4aa78d9
Provide promised default for magit-reset-head.
2008-08-17 02:59:50 +03:00
Marius Vollmer
d530079be5
Remove magit-log-commit.
2008-08-17 02:55:41 +03:00
Marius Vollmer
a88933a1d2
Typo (aka incomplete refactoring).
...
* magit.el (magit-automatic-merge): Use rev instead of branch, stupid.
2008-08-17 02:54:44 +03:00
Marius Vollmer
72819bd451
Make 'd' diff against working tree, not HEAD.
...
* magit.el (magit-diff-head, magit-diff-working-tree): Renamed former
to latter. Use single revision when calling magit-diff.
2008-08-17 02:38:37 +03:00
Marius Vollmer
bf1c66ce5c
Don't be too clever when showing default revisions.
...
* magit.el (magit-read-rev): Do not use magit-rev-describe when
formatting the default value for the prompt. This is misleading since
it might use names of branches etc while in reality we are might be
offering a raw commit.
2008-08-17 02:38:36 +03:00
Marius Vollmer
6a0b8c83e4
Declare submodes of buffer, now that all of them are in magit-mode.
...
* magit.el (magit-mode-init): New.
(magit-status, magit-diff, magit-log): Use it.
(magit-find-buffer, magit-find-status-buffer): Look at magit-submode.
2008-08-17 02:38:36 +03:00
Marius Vollmer
8b481fb716
Removed magit-checkout-commit.
2008-08-17 02:38:36 +03:00
Marius Vollmer
e82f5da831
Show default when asking for a revision.
...
* magit.el (magit-read-rev): Include default in prompt. Updated all
callers to new prompt rules..
(magit-checkout): Use magit-default-rev interactively.
2008-08-17 02:38:36 +03:00
Marius Vollmer
b74bb2d2d9
General defaulting for revisions.
...
* magit.el (magit-commit-at-point): Added option nil-ok-p argument.
(magit-default-rev): New.
2008-08-17 02:38:36 +03:00
Marius Vollmer
3c9bf0a0f2
Make magit-reset-working-tree interactive.
...
* magit.el (magit-reset-working-tree): Add 'interactive' form.
2008-08-17 02:38:36 +03:00
Marius Vollmer
7d0da4a5bd
Redone diffing, logging, and resetting.
...
Provide generic support for revisions and ranges of revisions as
arguments to interactive functions.
2008-08-17 02:38:36 +03:00
Marius Vollmer
5072939384
* magit.el (magit-update-status): Bring back Unpushed commit.
2008-08-17 02:38:36 +03:00
Marius Vollmer
b4efebca2f
Remove magit-log-mode, use generic magit-mode instead.
...
* magit.el (magit-mode): Truncate lines.
2008-08-17 02:38:36 +03:00
Marius Vollmer
48386c915c
Unified keymaps, make resetting use the commit at point instead of
...
asking, changed Unpushed commits to Recent commits.
2008-08-17 02:38:36 +03:00
Marius Vollmer
d8184590ca
Updated TODO
2008-08-17 02:38:36 +03:00
Marius Vollmer
25b62f6f05
Make it work with Emacs 22.
...
* magit.el (magit-hunk-is-conflict-p): Use looking-at instead of
looking-at-p, which is only available in Emacs 23.
2008-08-15 21:33:17 +03:00
Marius Vollmer
4b2dd0f262
Allow diffing with the mark in the status buffer.
...
* magit.el (magit-mode-map): Bind magit-diff-with-mark to '='.
2008-08-14 01:50:50 +03:00
Marius Vollmer
62b5fd8fc1
Doc updates.
2008-08-14 01:07:44 +03:00
Marius Vollmer
a0dc20dc52
Show running command in the mode line.
...
* magit.el (magit-set-mode-line-process): New.
(magit-run, magit-process-sentinel): Use it.
(magit-mode): Initialiaze magit-line-process, for documentation purposes.
2008-08-13 17:27:31 +03:00
Marius Vollmer
98c6d4ff90
Avoid setting the mark when updating the status buffer.
...
* magit.el (magit-goto-line): New.
(magit-update-status): Use it.
2008-08-13 17:25:32 +03:00
Marius Vollmer
231c4ba164
Only ignore files in the current directory, not in subdirectories.
...
* magit.el (magit-ignore-thing-at-point): Prefix .gitignore line with
"/" so that it only matches in current directory.
2008-08-13 07:32:04 +03:00
Marius Vollmer
555377edcc
Silence byte compiler. Added skeleton Makefile.
2008-08-13 06:14:53 +03:00
Marius Vollmer
e8cc5fdf1b
Updated manual menus.
2008-08-13 05:35:43 +03:00
Marius Vollmer
22ee4f7685
Rebasing.
2008-08-13 05:28:16 +03:00
Marius Vollmer
e19bea5bf1
Define keymaps the right way.
2008-08-13 00:33:31 +03:00
Marius Vollmer
ff389d33be
Use 's' for staging, not 'a'.
2008-08-13 00:01:10 +03:00
Marius Vollmer
fc723bcef6
Updated TODO.
2008-08-12 17:39:44 +03:00
Marius Vollmer
659480b4e3
* magit.el (magit-read-top-dir): Also ask when top-dir can't be found.
2008-08-12 13:52:16 +03:00
Marius Vollmer
343382cdae
Added empty manual.
2008-08-12 04:41:14 +03:00
Marius Vollmer
08de8c72b1
Added README, AUTHORS, and NEWS.
2008-08-12 04:31:07 +03:00
Marius Vollmer
0ef2ee3dd8
Be more flexible with the diffing.
...
* magit.el (magit-show-diff): Accept variable number of arguments.
Updated callers.
2008-08-12 03:18:04 +03:00
Marius Vollmer
8c4b0f9184
Diffing with branches.
...
* magit.el (magit-diff-with-branch): New.
2008-08-12 03:14:54 +03:00
Marius Vollmer
087e1b47bc
Maintain a marked object and diff against it from the log buffer.
2008-08-12 02:42:13 +03:00
Marius Vollmer
b59f9d9841
More robust diff washing.
...
* magit.el (magit-wash-diff): Don't try to get the prefix from
non-accessible parts of the buffer.
2008-08-12 00:28:28 +03:00
Marius Vollmer
55afcba382
Visit commits by showing their details.
...
* magit.el (magit-visit-thing-at-point): Handle 'commit' infos.
2008-08-12 00:22:01 +03:00
Marius Vollmer
175c816cf2
Show unpushed changes as graph.
...
* magit.el (magit-update-status): Add "--graph" to git-log arguments.
2008-08-12 00:21:15 +03:00
Marius Vollmer
3d2316835a
Show log instead of diffstat for unpushed changes.
...
* magit.el (magit-update-status): Use git-log and wash the output.
2008-08-12 00:16:15 +03:00
Marius Vollmer
1fab257814
Allow free form entry of branches, tags, etc.
...
* magit.el (magit-read-other-branch, magit-read-rev): Renamed former
to latter. Do not require a match. Changed all callers.
2008-08-12 00:08:45 +03:00
Marius Vollmer
7d31c70a26
Merge from devel.
...
* magit.el (magit-stage-thing-at-point): Improve docstring.
2008-08-11 22:44:41 +03:00