diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-04-16 12:39:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-16 12:39:41 -0700 |
| commit | 0e9b0ac712d09d77a10586f5ff669bf6af3dd538 (patch) | |
| tree | a3f330dd7e4d0065974d839299413c37f082b3ce | |
| parent | RelNotes: the first batch of topics graduated to 'master' (diff) | |
| parent | rebase -i: remind that the lines are top-to-bottom (diff) | |
| download | tgif-0e9b0ac712d09d77a10586f5ff669bf6af3dd538.tar.xz | |
Merge branch 'nl/rebase-i-cheat-sheet'
* nl/rebase-i-cheat-sheet:
rebase -i: remind that the lines are top-to-bottom
| -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 5812222eb9..2b7eb6dda4 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. # |