summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorNeil Horman <nhorman@tuxdriver.com>2012-04-20 14:36:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-04-24 22:24:14 (GMT)
commit90e1818f9a06015159712e204dd90868e0a6c421 (patch)
tree7f67e462df570c25739263c3f181fff63c129133 /xdiff
parentbedfe86ce6ccee90e2cbecbf8d72e06219a2768a (diff)
downloadgit-90e1818f9a06015159712e204dd90868e0a6c421.zip
git-90e1818f9a06015159712e204dd90868e0a6c421.tar.gz
git-90e1818f9a06015159712e204dd90868e0a6c421.tar.bz2
git-rebase: add keep_empty flag
Add a command line switch to git-rebase to allow a user the ability to specify that they want to keep any commits in a series that are empty. When git-rebase's type is am, then this option will automatically keep any commit that has a tree object identical to its parent. This patch changes the default behavior of interactive rebases as well. With this patch, git-rebase -i will produce a revision set passed to git-revision-editor, in which empty commits are commented out. Empty commits may be kept manually by uncommenting them. If the new --keep-empty option is used in an interactive rebase the empty commits will automatically all be uncommented in the editor. Signed-off-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions