summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2007-07-08 20:32:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-07-09 01:24:19 (GMT)
commit82576ddb70d0a2ed88fa3fee2f4ad05ab5b77401 (patch)
tree7e83b5619ae56c9a52f3636bf921431839d6d3d4
parent8e4a91bd780b89c7337f281a8601f2e0cae108fc (diff)
downloadgit-82576ddb70d0a2ed88fa3fee2f4ad05ab5b77401.zip
git-82576ddb70d0a2ed88fa3fee2f4ad05ab5b77401.tar.gz
git-82576ddb70d0a2ed88fa3fee2f4ad05ab5b77401.tar.bz2
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>
-rwxr-xr-xgit-rebase--interactive.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index ac4d559..d9563ec 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -401,6 +401,9 @@ do
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit
+#
+# If you remove a line here THAT COMMIT WILL BE LOST.
+#
EOF
git rev-list $MERGES_OPTION --pretty=oneline --abbrev-commit \
--abbrev=7 --reverse $UPSTREAM..$HEAD | \