Commit graph

1092 commits

Author SHA1 Message Date
Phil Jackson
4b23df61f5 Added a little documentation to the log functions. 2010-06-01 16:46:53 +01:00
Phil Jackson
961e8c94c0 Added `magit-log-first-parent' command. 2010-06-01 16:40:21 +01:00
Phil Jackson
ba89b01730 Merge branch 'rebase-mode-fixes' 2010-05-31 22:23:07 +01:00
Phil Jackson
78800f2104 Fixed the action regexp which was too greedy. 2010-05-31 22:22:42 +01:00
Phil Jackson
f4ef288e77 Repopulate `auto-mode-alist'. 2010-05-31 22:22:41 +01:00
Phil Jackson
18a3cd7657 Stop using generic-mode. Highlight comments manually. 2010-05-31 22:22:40 +01:00
Phil Jackson
56fb23cf0b Merge branch 'rebase-mode' 2010-05-31 21:05:41 +01:00
Phil Jackson
6654af768d Don't allow the editing of lines which aren't action lines. 2010-05-31 21:05:12 +01:00
Phil Jackson
6c9a49461c c for pick, n and p for navigation. 2010-05-31 21:05:10 +01:00
Phil Jackson
c2c15b67c4 Only ask to abort when buffer is modified. 2010-05-31 21:05:08 +01:00
Phil Jackson
243de6b58c C-c C-c analogous to C-c # and C-c C-k analogous to a. 2010-05-31 21:05:06 +01:00
Phil Jackson
927f9b2206 Merge remote branch 'refs/remotes/avar/avar/interactive-rebase-read-rev' 2010-05-31 18:10:06 +01:00
Ævar Arnfjörð Bjarmason
40dc79f33b Use (magit-read-rev) for "Interactively rebase to:" message
Now it has tab completion like the switch branch command and others
which use (magit-read-rev).

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
2010-05-31 17:06:52 +00:00
Phil Jackson
fb5e8eb382 Merge branch 'rebase-mode' 2010-05-31 17:46:56 +01:00
Phil Jackson
ddc55ba6a0 Move column handling up a level in move functions. 2010-05-31 17:38:47 +01:00
Phil Jackson
4ad4e945c3 Keep column position when moving lines. 2010-05-31 17:17:53 +01:00
Phil Jackson
98b845afa1 Create the edit function dynamically so we get a description in `describe-mode'. 2010-05-31 17:12:19 +01:00
Phil Jackson
41ab790cde Bit of formatting. 2010-05-31 17:00:02 +01:00
Phil Jackson
adb85163de Licence, a little commentary. 2010-05-31 16:56:04 +01:00
Phil Jackson
a7048a9b71 Clarify abort docs. 2010-05-31 16:54:39 +01:00
Phil Jackson
c0abcc096a Ask the user when aborting a rebase. 2010-05-31 16:51:06 +01:00
Phil Jackson
0244b8b1b1 Only kill a line if it looks like an action line. 2010-05-31 16:50:02 +01:00
Phil Jackson
480f0726d0 Document functions, mode. 2010-05-31 16:49:29 +01:00
Phil Jackson
c5978a4cde Docs for variables. 2010-05-31 16:46:25 +01:00
Phil Jackson
a45558e61e Added `rebase-mode-abort'. 2010-05-31 16:44:27 +01:00
Phil Jackson
1aecf75104 Improve the move-{up,down} functions. 2010-05-31 16:40:58 +01:00
Phil Jackson
d50d80e6cd Made move-{up,down} functions rebase-mode specific. 2010-05-31 16:22:32 +01:00
Phil Jackson
1f56562935 Added and mapped `rebase-mode-kill-line'. 2010-05-31 16:21:28 +01:00
Phil Jackson
aad24fa54e Basics working. Keybindings, highlighting. 2010-05-31 16:06:44 +01:00
Ramkumar Ramachandra
9813ac8859 Replace save-excursion, set-buffer with with-current-buffer
When byte-compiling magit.el, Emacs throws several warnings saying
`save-excursion' defeated by `set-buffer'. Eliminate these warnings by
replacing calls to save-excursion followed by set-buffer with
with-current-buffer.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
2010-05-30 15:58:15 +01:00
Ramkumar Ramachandra
c33f87fe71 Replace goto-line
Replace goto-line with a more suitable combination of goto-char and
forward-line.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
2010-05-30 15:58:12 +01:00
Moritz Bunkus
dc8cc4cb95 Forward port server-running-p' from Emacs 23 as magit-server-running-p' for Emacs < 22 and calls `server-running-p' on >= 23. 2010-05-29 13:24:56 +01:00
Rémi Vanicat
19cb16c32d Remove decency on parse-time. 2010-05-26 21:41:59 +01:00
Phil Jackson
87e196ed10 Highlight the sha1 at the top of a diff buffer. 2010-05-26 18:50:08 +01:00
Rémi Vanicat
7d4c2f6fc8 In magit-insert-section, do not presume that CMD is git
Removing the magit-git-standard-options from magit-insert-section
because:

- the only use of magit-insert-section is inside magit-git-section
  that already add the magit-git-standard-options, we do not need to add
  them twice
- as wrote, magit-insert-section could be used for calling any cmd,
  that may not understand the option in magit-git-standard-options.
2010-05-26 18:45:03 +01:00
Phil Jackson
0f628c37ce Merge remote branch 'refs/remotes/vanicat/t/multi-buffer' 2010-05-26 18:22:36 +01:00
Rémi Vanicat
ab90bdf159 [magit-status] Use generate-new-buffer for creating a new buffer
Closes #13: We used to use get-buffer-create, but it will reuse a
buffer with the same name, when we want to create a new one with an
unique name.
2010-05-26 17:15:50 +02:00
Rémi Vanicat
0bb2e4c86f Removing a duplicate switch-to-buffer
We don't need to change buffer twice when we use a new buffer
2010-05-26 17:09:35 +02:00
Oscar Fuentes
cb49072477 Fixed magit-move-branch 2010-05-24 04:35:29 +02:00
Phil Jackson
3bdaf275db Added Mark Hepburn to the contributors list. 2010-05-21 09:45:02 +01:00
Mark Hepburn
98d87b1288 magit-interactive-rebase: use locate-file and exec-path to find emacsclient, instead of hard-coding to exec-directory 2010-05-21 09:45:00 +01:00
Phil Jackson
017828d250 Nicer colours for the tag indicators. 2010-05-20 00:22:14 +01:00
Phil Jackson
b0b65a2434 Nicer colours for the bisect refs. 2010-05-20 00:15:14 +01:00
Phil Jackson
9878186262 Log buffer knows about tagging again.
Closes #5.
2010-05-19 23:23:25 +01:00
Phil Jackson
dc9c1178fd `magit-tag' now knows about revisions. 2010-05-19 23:22:03 +01:00
Phil Jackson
0241232622 Added a couple of faces for good/bad bisect refs. 2010-05-19 22:58:57 +01:00
Oscar Fuentes
2d115df020 Displays the option name instead of the description 2010-05-19 18:10:31 +02:00
Oscar Fuentes
7e8819dbf2 Use all available columns on window for displaying menu items 2010-05-19 03:39:34 +02:00
Oscar Fuentes
fc62c664fd Highlight active options on menu. 2010-05-18 21:52:01 +02:00
Oscar Fuentes
ad5829a2f4 Fixed usage of magit-custom-options on some commands
It is not good to have magit-custom-options when it is nil into the
middle of the list of arguments.
2010-05-18 19:50:19 +02:00