diff options
| author | Neil Horman <nhorman@tuxdriver.com> | 2012-04-20 14:36:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-24 22:24:14 (GMT) |
| commit | 90e1818f9a06015159712e204dd90868e0a6c421 (patch) | |
| tree | 7f67e462df570c25739263c3f181fff63c129133 /git-rebase.sh | |
| parent | bedfe86ce6ccee90e2cbecbf8d72e06219a2768a (diff) | |
| download | git-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 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 69c1374..24a2840 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -43,6 +43,7 @@ s,strategy=! use the given merge strategy no-ff! cherry-pick all commits, even if unchanged m,merge! use merging strategies to rebase i,interactive! let the user edit the list of commits to rebase +k,keep-empty preserve empty commits during rebase f,force-rebase! force rebase even if branch is up to date X,strategy-option=! pass the argument through to the merge strategy stat! display a diffstat of what changed upstream @@ -97,6 +98,7 @@ state_dir= action= preserve_merges= autosquash= +keep_empty= test "$(git config --bool rebase.autosquash)" = "true" && autosquash=t read_basic_state () { @@ -220,6 +222,9 @@ do -i) interactive_rebase=explicit ;; + -k) + keep_empty=yes + ;; -p) preserve_merges=t test -z "$interactive_rebase" && interactive_rebase=implied |