rebase -i: put a nice warning into the todo list
It seems that not everybody expects a difference between keeping a "pick" line, and deleting it. So be a bit more explicit about that, with all capitals to get the attention. Noticed by vmiklos on IRC. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Jul 8, 2007 at 21:32 UTC
82576ddb70d0a2ed88fa3fee2f4ad05ab5b77401
1 file changed
+3
git-rebase--interactive.sh
+3
@@ -401,6 +401,9 @@ do
401
# pick = use commit
402
# edit = use commit, but stop for amending
403
# squash = use commit, but meld into previous commit
404
+#
405
+# If you remove a line here THAT COMMIT WILL BE LOST.
406
+#
407
EOF
408
git rev-list $MERGES_OPTION --pretty=oneline --abbrev-commit \
409
--abbrev=7 --reverse $UPSTREAM..$HEAD | \