summaryrefslogtreecommitdiff
path: root/xdiff/xdiffi.h
diff options
context:
space:
mode:
authorLibravatar Genki Sky <sky@genki.is>2018-02-04 15:08:13 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-02-07 11:26:46 -0800
commita6c612b528a22fe9d4cad8807e36d18f2f0fea2c (patch)
treea520da1c06053fdf5f37f7bb6e55adea3c1e4cbd /xdiff/xdiffi.h
parentFirst batch after 2.16 (diff)
downloadtgif-a6c612b528a22fe9d4cad8807e36d18f2f0fea2c.tar.xz
rebase: add --allow-empty-message option
This option allows commits with empty commit messages to be rebased, matching the same option in git-commit and git-cherry-pick. While empty log messages are frowned upon, sometimes one finds them in older repositories (e.g. translated from another VCS [0]), or have other reasons for desiring them. The option is available in git-commit and git-cherry-pick, so it is natural to make other git tools play nicely with them. Adding this as an option allows the default to be "give the user a chance to fix", while not interrupting the user's workflow otherwise [1]. [0]: https://stackoverflow.com/q/8542304 [1]: https://public-inbox.org/git/7vd33afqjh.fsf@alter.siamese.dyndns.org/ To implement this, add a new --allow-empty-message flag. Then propagate it to all calls of 'git commit', 'git cherry-pick', and 'git rebase--helper' within the rebase scripts. Signed-off-by: Genki Sky <sky@genki.is> Reviewed-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xdiffi.h')
0 files changed, 0 insertions, 0 deletions