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
Marius Vollmer
3c91c2d7af
More docs.
...
* magit.el (magit-stage-thing-at-point, magit-unstage-thing-at-point):
Added correct docstrings.
2008-08-11 22:37:26 +03:00
Marius Vollmer
75b2ce7977
More docs.
...
* magit.el (magit-unstage-thing-at-point): Added docstring.
2008-08-11 22:34:35 +03:00
Marius Vollmer
ba206d1862
More docs.
2008-08-11 22:31:21 +03:00
Marius Vollmer
f88fd14590
Updated TODO
2008-08-11 22:28:05 +03:00
Marius Vollmer
69101a1115
Even more documentation.
...
* magit.el (magit-show-commit): Added docstring.
2008-08-11 22:26:04 +03:00
Marius Vollmer
22287217df
More documentation.
...
* magit.el (magit-quit): Add docstring.
2008-08-11 22:25:43 +03:00
Marius Vollmer
e6ba8fdf31
Show combined diffs with git-log.
...
* magit.el (magit-show-commit): Add "--cc" to git-log invocation.
2008-08-11 19:17:47 +03:00
Marius Vollmer
fc3286ffa0
Merge dev, document magit-log-mode.
2008-08-11 19:12:32 +03:00
Marius Vollmer
47d9520d42
History browsing improvements.
...
* magit.el (magit-show-commit): Make sure we use the right directory.
(magit-wash-log): Deal with the commit SHA1 not being at the beginning
of the line.
(magit-browse-log): Add "--graph" for extra niceness.
(magit-log-commit): New.
2008-08-11 18:32:07 +03:00
Marius Vollmer
0b3118061d
Add HEAD info to status buffer.
2008-08-11 15:46:17 +03:00
Marius Vollmer
a63fbfa2ce
Checking out of commits.
2008-08-11 15:42:23 +03:00
Marius Vollmer
3aa3f478e9
Updated TODO.
2008-08-11 06:00:55 +03:00
Marius Vollmer
a5b4bcd354
Renamed *git-process* buffer to *magit-process*.
2008-08-11 05:42:07 +03:00
Marius Vollmer
133e40b90b
Make *magit-commit* buffer read-only.
2008-08-11 05:41:28 +03:00
Marius Vollmer
2e07984097
Actually pass the head to git-log.
2008-08-11 05:18:55 +03:00
Marius Vollmer
5742fa3476
Branch browsing.
2008-08-11 05:16:43 +03:00
Marius Vollmer
eb62d6d59f
Initial support for history browsing.
2008-08-11 05:10:10 +03:00
Marius Vollmer
16eb6acc95
Support for add-change-log-entry kind of functionality.
...
* magit.el (magit-add-log): New, bind it to `C'.
2008-08-11 03:23:54 +03:00
Marius Vollmer
2f5d41a8ac
Be more accurate when visiting via hunks.
...
* magit.el (magit-hunk-target-line): New.
(magit-visit-thing-at-point): Use it.
2008-08-11 03:22:50 +03:00
Marius Vollmer
036448e1b8
Add section markers to washed output and try to preserve position when
...
updating status buffer.
2008-08-11 01:28:35 +03:00
Marius Vollmer
db13d0c863
Be more verbose.
2008-08-08 19:01:24 +03:00
Marius Vollmer
bd27dcd948
Updated.
2008-08-07 03:03:26 +03:00
Marius Vollmer
8625e157af
Docs and hooks.
2008-08-07 03:02:45 +03:00
Marius Vollmer
6801bef645
Mode-ify magit-mode and allow multiple status buffers to exist.
2008-08-07 01:49:35 +03:00
Marius Vollmer
7a3e2bdf2c
Correctly reset state when starting a new hunk.
2008-08-06 15:51:09 +03:00
Marius Vollmer
abb3b6880c
Updated.
2008-08-06 15:49:51 +03:00
Marius Vollmer
66d50d8466
Describe things at point.
2008-08-06 15:48:55 +03:00
Marius Vollmer
adfb76c91d
Soft resetting.
2008-08-06 14:48:03 +03:00
Marius Vollmer
e9132a53d4
Resetting.
2008-08-06 14:41:48 +03:00
Marius Vollmer
c55f27dadd
Show merge heads in status and don't insert MERGE_MSG in log-edit buffer.
2008-08-06 04:18:41 +03:00
Marius Vollmer
c4afadff2e
Omit last empty element in shell-lines.
...
New file-lines function.
2008-08-06 04:13:40 +03:00
Marius Vollmer
7ce74c2879
Didn't know about split-string...
2008-08-06 03:47:42 +03:00
Marius Vollmer
45f8fa9763
Updated.
2008-08-06 03:47:26 +03:00
Marius Vollmer
25ee763f82
Moved things around a bit.
2008-08-06 03:22:22 +03:00
Marius Vollmer
86157f2586
Don't wash the --stat output.
2008-08-06 03:22:01 +03:00
Marius Vollmer
e448d4f214
Updated
2008-08-06 02:44:41 +03:00
Marius Vollmer
5baf4ddf71
Renamed to magit.
2008-08-06 02:41:05 +03:00
Marius Vollmer
3cb3b56759
Renamed.
2008-08-06 02:38:46 +03:00