diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-07-08 21:32:22 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2007-07-08 18:24:19 -0700 |
| commit | 82576ddb70d0a2ed88fa3fee2f4ad05ab5b77401 (patch) | |
| tree | 7e83b5619ae56c9a52f3636bf921431839d6d3d4 | |
| parent | rebase -i: remember the settings of -v, -s and -p when interrupted (diff) | |
| download | tgif-82576ddb70d0a2ed88fa3fee2f4ad05ab5b77401.tar.xz | |
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-x | 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 ac4d559f07..d9563ec46f 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 | \ |