diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-03-16 14:48:33 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-20 20:30:30 (GMT) |
| commit | 8a93f9576a705753845ffa9fc5eb62c1d7fdd4a1 (patch) | |
| tree | 1d11084b83fe578087240b6f26edb593c22fb8bb /git-rebase--interactive.sh | |
| parent | a99c5e5921fcb4fd003fd3424be4db649393731f (diff) | |
| download | git-8a93f9576a705753845ffa9fc5eb62c1d7fdd4a1.zip git-8a93f9576a705753845ffa9fc5eb62c1d7fdd4a1.tar.gz git-8a93f9576a705753845ffa9fc5eb62c1d7fdd4a1.tar.bz2 | |
rebase -i: remind that the lines are top-to-bottom
Nelson Benitez Leon opened a discussion with a patch with this in the
note:
Hi, I was using git rebase -i for some time now and never occured to
me I could reorder the commit lines to affect the order the commits
are applied, learnt that recently from a git tutorial.
Nelson's patch was to stress the fact that the lines in the insn sheet can
be re-ordered in a much more verbose way. Let's add a one-liner reminder
and also remind that the lines in the insn sheet is read from top to
bottom, unlike the "git log" output.
Discussion-triggered-by: Nelson Benitez Leon
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--interactive.sh')
| -rw-r--r-- | git-rebase--interactive.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 5812222..2b7eb6d 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -846,6 +846,8 @@ cat >> "$todo" << EOF # f, fixup = like "squash", but discard this commit's log message # x, exec = run command (the rest of the line) using shell # +# These lines can be re-ordered; they are executed from top to bottom. +# # If you remove a line here THAT COMMIT WILL BE LOST. # However, if you remove everything, the rebase will be aborted. # |