diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-02-06 22:05:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-06 22:05:20 -0800 |
| commit | 8fe9c3f21dff206acb464d86cbd3bf4dbbb94f38 (patch) | |
| tree | f33b9ec70cc3d7e7a068d7ef24a6895d69accf00 /.gitignore | |
| parent | Fifth batch for 2.21 (diff) | |
| parent | rebase: implement --merge via the interactive machinery (diff) | |
| download | tgif-8fe9c3f21dff206acb464d86cbd3bf4dbbb94f38.tar.xz | |
Merge branch 'en/rebase-merge-on-sequencer'
"git rebase --merge" as been reimplemented by reusing the internal
machinery used for "git rebase -i".
* en/rebase-merge-on-sequencer:
rebase: implement --merge via the interactive machinery
rebase: define linearization ordering and enforce it
git-legacy-rebase: simplify unnecessary triply-nested if
git-rebase, sequencer: extend --quiet option for the interactive machinery
am, rebase--merge: do not overlook --skip'ed commits with post-rewrite
t5407: add a test demonstrating how interactive handles --skip differently
rebase: fix incompatible options error message
rebase: make builtin and legacy script error messages the same
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 8bcf153ed9..6fd61c7272 100644 --- a/.gitignore +++ b/.gitignore @@ -125,7 +125,6 @@ /git-rebase--am /git-rebase--common /git-rebase--interactive -/git-rebase--merge /git-rebase--preserve-merges /git-receive-pack /git-reflog |