aboutsummaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-10 10:29:14 -0700
committerJunio C Hamano <gitster@pobox.com>2012-05-10 10:29:14 -0700
commitbb16e8f42276bfca8f8b33d9dbb40c5cba50b8de (patch)
tree5ea70c718417fb5c0a53d257d07cd1f40a08ca93 /git-rebase--interactive.sh
parentc83645a642e40bf6a4a2365ceb1950baf406ec34 (diff)
parent8a93f9576a705753845ffa9fc5eb62c1d7fdd4a1 (diff)
downloadgit-bb16e8f42276bfca8f8b33d9dbb40c5cba50b8de.tar.gz
git-bb16e8f42276bfca8f8b33d9dbb40c5cba50b8de.tar.xz
Merge branch 'nl/rebase-i-cheat-sheet' into maint
* nl/rebase-i-cheat-sheet: rebase -i: remind that the lines are top-to-bottom
Diffstat (limited to 'git-rebase--interactive.sh')
-rw-r--r--git-rebase--interactive.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 454674976..2e1325824 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.
#