git-cherry-pick: add allow-empty option
authorNeil Horman <nhorman@tuxdriver.com>
Wed, 11 Apr 2012 20:21:53 +0000 (16:21 -0400)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Apr 2012 20:46:08 +0000 (13:46 -0700)
commitdf478b744cee9821eb2abbe2202d262b87a34289
tree63bbd30c18322c3ebfba2d53dac483a67b3bbb21
parente8dde3e5f9ddb7cf95a6ff3cea6cf07c3a2db80d
git-cherry-pick: add allow-empty option

git cherry-pick fails when picking a non-ff commit that is empty.  The advice
given with the failure is that a git-commit --allow-empty should be issued to
explicitly add the empty commit during the cherry pick.  This option allows a
user to specify before hand that they want to keep the empty commit.  This
eliminates the need to issue both a cherry pick and a commit operation.

Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-cherry-pick.txt
builtin/revert.c
sequencer.c
sequencer.h