Merge branch 'nl/rebase-i-cheat-sheet' into maint

* nl/rebase-i-cheat-sheet:
  rebase -i: remind that the lines are top-to-bottom
This commit is contained in:
Junio C Hamano 2012-05-10 10:29:14 -07:00
Родитель c83645a642 8a93f9576a
Коммит bb16e8f422
1 изменённых файлов: 2 добавлений и 0 удалений

Просмотреть файл

@ -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.
#