diff options
author | Jeff King <peff@peff.net> | 2013-07-26 19:39:28 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-07-29 08:17:06 -0700 |
commit | c17592a7a2420a61c4c407f4cf635f196f1254f3 (patch) | |
tree | eba5489f8c4d642906d00274d5223063928bc414 /Documentation/git-replace.txt | |
parent | Git 1.8.0.3 (diff) | |
download | tgif-c17592a7a2420a61c4c407f4cf635f196f1254f3.tar.xz |
commit: tweak empty cherry pick advice for sequencer
When we refuse to make an empty commit, we check whether we
are in a cherry-pick in order to give better advice on how
to proceed. We instruct the user to repeat the commit with
"--allow-empty" to force the commit, or to use "git reset"
to skip it and abort the cherry-pick.
In the case of a single cherry-pick, the distinction between
skipping and aborting is not important, as there is no more
work to be done afterwards. When we are using the sequencer
to cherry pick a series of commits, though, the instruction
is confusing: does it skip this commit, or does it abort the
rest of the cherry-pick?
It does skip, after which the user can continue the
cherry-pick. This is the right thing to be advising the user
to do, but let's make it more clear what will happen, both
by using the word "skip", and by mentioning that the rest of
the sequence can be continued via "cherry-pick --continue"
(whether we skip or take the commit).
Noticed-by: Ramkumar Ramachandra <artagnon@gmail.com>
Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-replace.txt')
0 files changed, 0 insertions, 0 deletions