Commit graph

176 commits

Author SHA1 Message Date
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
e067f18a2e Merge devel. 2008-08-17 02:44:29 +03:00
Marius Vollmer
dfa35cb2e0 Updated NEWS. 2008-08-17 02:43:39 +03:00
Marius Vollmer
6538ce4e4a Manual improvements and updates. 2008-08-17 02:38:37 +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
7eb8d11311 Update NEWS. 2008-08-17 02:37:43 +03:00
Marius Vollmer
83615b597e Prepare 0.6-1 2008-08-16 16:18:07 +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
207fd6c10f Released 0.5-1. 2008-08-14 02:11:26 +03:00
Marius Vollmer
7a57506ae0 Updated manual. 2008-08-14 02:10:24 +03:00
Marius Vollmer
e37626e24a Manual improvements. 2008-08-14 02:05:19 +03:00
Marius Vollmer
52c2e3e4ee Speling fixes. 2008-08-14 02:01:21 +03:00
Marius Vollmer
636c6768e3 Manual improvements. 2008-08-14 01:51:07 +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
8ac6b4d8bd Ignore me. 2008-08-13 07:32:15 +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
5f562fb22a Infor for installinfo 2008-08-13 07:20:47 +03:00
Marius Vollmer
a367e69a82 Provide autogen.sh 2008-08-13 07:11:44 +03:00
Marius Vollmer
f5c3459032 Mark it as unreleased. 2008-08-13 07:10:39 +03:00
Marius Vollmer
b8e6b0f80a Debianized. 2008-08-13 07:08:34 +03:00
Marius Vollmer
c4b06cf840 Changelog... 2008-08-13 07:04:55 +03:00
Marius Vollmer
1e49412d62 Half-way debianized. 2008-08-13 06:58:03 +03:00
Marius Vollmer
94e82247fb Prepare release a bit. 2008-08-13 06:48:46 +03:00
Marius Vollmer
2404a05d78 Make build cruft work. 2008-08-13 06:47:09 +03:00
Marius Vollmer
44c932322a Added autotools cruft. 2008-08-13 06:20:36 +03:00
Marius Vollmer
62643f94ff Chapter renamings. 2008-08-13 06:15:13 +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
14b1153589 Manual additions. 2008-08-13 05:06:37 +03:00
Marius Vollmer
067e7156f8 More manual stuff, use "Magit" and "Git" spelling. 2008-08-13 01:54:06 +03:00
Marius Vollmer
e19bea5bf1 Define keymaps the right way. 2008-08-13 00:33:31 +03:00
Marius Vollmer
e4aceaf6b8 Manual additions. 2008-08-13 00:22:35 +03:00
Marius Vollmer
11689b7dc7 Manual additions. 2008-08-13 00:15:14 +03:00
Marius Vollmer
ff389d33be Use 's' for staging, not 'a'. 2008-08-13 00:01:10 +03:00
Marius Vollmer
ff21f5abfc Some content for the manual. 2008-08-12 17:40:17 +03:00