threads / discuss / 8934

[TICPATCH] rebase -i: put a nice warning into the todo list

Subject: [TICPATCH] rebase -i: put a nice warning into the todo list

## tl;dr

One message between Jul 8, 2007 and Jul 8, 2007.

replies: 0people: 1as markdown or json

Johannes Schindelin· Jul 8, 2007, 20:32 UTC · lore

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>
---
 git-rebase--interactive.sh |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index a9bb622..03ad8e6 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -400,6 +400,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 | \

← back to recent threads