From 82576ddb70d0a2ed88fa3fee2f4ad05ab5b77401 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sun, 8 Jul 2007 21:32:22 +0100 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- git-rebase--interactive.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index ac4d559f0..d9563ec46 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 | \ -- 2.30.2