diff options
| author | Neil Horman <nhorman@tuxdriver.com> | 2012-04-20 10:36:17 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-24 15:24:14 -0700 |
| commit | 90e1818f9a06015159712e204dd90868e0a6c421 (patch) | |
| tree | 7f67e462df570c25739263c3f181fff63c129133 /Documentation | |
| parent | bedfe86ce6ccee90e2cbecbf8d72e06219a2768a (diff) | |
| download | git-90e1818f9a06015159712e204dd90868e0a6c421.tar.gz git-90e1818f9a06015159712e204dd90868e0a6c421.tar.xz | |
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 'Documentation')
| -rw-r--r-- | Documentation/git-rebase.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 520aaa94f..841ebd6a9 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -238,6 +238,10 @@ leave out at most one of A and B, in which case it defaults to HEAD. will be reset to where it was when the rebase operation was started. +--keep-empty:: + Keep the commits that do not change anything from its + parents in the result. + --skip:: Restart the rebasing process by skipping the current patch. |