diff options
| author |   Junio C Hamano <gitster@pobox.com> | 2018-11-02 11:04:52 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-02 11:04:52 +0900 |
| commit | 5ae50845d8a30d7db32e139ce04b712f9deb99cd (patch) | |
| tree | 0b01b1bf5c765b894c5ab6482f143b318f5729bb /.gitignore | |
| parent | Seventh batch for 2.20 (diff) | |
| parent | builtin/rebase: support running "git rebase <upstream>" (diff) | |
| download | git-5ae50845d8a30d7db32e139ce04b712f9deb99cd.tar.xz git-5ae50845d8a30d7db32e139ce04b712f9deb99cd.zip | |
Merge branch 'pk/rebase-in-c'
Rewrite of the "rebase" machinery in C.
* pk/rebase-in-c:
builtin/rebase: support running "git rebase <upstream>"
rebase: refactor common shell functions into their own file
rebase: start implementing it as a builtin
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 64b3377d40c..4d5de166e85 100644 --- a/.gitignore +++ b/.gitignore @@ -81,6 +81,7 @@ /git-init-db /git-interpret-trailers /git-instaweb +/git-legacy-rebase /git-log /git-ls-files /git-ls-remote @@ -121,6 +122,7 @@ /git-read-tree /git-rebase /git-rebase--am +/git-rebase--common /git-rebase--helper /git-rebase--interactive /git-rebase--merge |