diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-07-02 01:45:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-02 01:45:47 -0700 |
| commit | f36db549057f09dd390d712fa2d72dd2599feba6 (patch) | |
| tree | 3f58a55fe4761614cf358090cd57ac5037302fd0 /.gitignore | |
| parent | e1bc8dc66dd5a2ef8b23c6b7cac8164d85e73307 (diff) | |
| parent | f09c9b8c5ff9d8a15499b09ccd6c3e7b3c76af77 (diff) | |
| download | git-f36db549057f09dd390d712fa2d72dd2599feba6.tar.gz | |
Merge branch 'js/rebase'
* js/rebase:
Teach rebase -i about --preserve-merges
rebase -i: provide reasonable reflog for the rebased branch
rebase -i: several cleanups
ignore git-rebase--interactive
Teach rebase an interactive mode
Move the pick_author code to git-sh-setup
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index e8b060cbe4..a2a617dc62 100644 --- a/.gitignore +++ b/.gitignore @@ -96,6 +96,7 @@ git-push git-quiltimport git-read-tree git-rebase +git-rebase--interactive git-receive-pack git-reflog git-relink |