diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-06-25 13:22:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-25 13:22:39 -0700 |
| commit | f3fec40e8d8798e5313f05a9273aef932fe4519e (patch) | |
| tree | 10f18d7bf621374a7cd1dc6dd3d7a1805800620e /.gitignore | |
| parent | Merge branch 'nd/complete-config-vars' (diff) | |
| parent | rebase: remove -p code from git-rebase--interactive.sh (diff) | |
| download | tgif-f3fec40e8d8798e5313f05a9273aef932fe4519e.tar.xz | |
Merge branch 'ag/rebase-p'
Separate "rebase -p" codepath out of "rebase -i" implementation to
slim down the latter and make it easier to manage.
* ag/rebase-p:
rebase: remove -p code from git-rebase--interactive.sh
rebase: use the new git-rebase--preserve-merges.sh
rebase: strip unused code in git-rebase--preserve-merges.sh
rebase: introduce a dedicated backend for --preserve-merges
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 388cc4beee..3284a1e9b1 100644 --- a/.gitignore +++ b/.gitignore @@ -119,6 +119,7 @@ /git-rebase--helper /git-rebase--interactive /git-rebase--merge +/git-rebase--preserve-merges /git-receive-pack /git-reflog /git-remote |