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 /Makefile | |
| parent | e1bc8dc66dd5a2ef8b23c6b7cac8164d85e73307 (diff) | |
| parent | f09c9b8c5ff9d8a15499b09ccd6c3e7b3c76af77 (diff) | |
| download | git-f36db549057f09dd390d712fa2d72dd2599feba6.tar.gz git-f36db549057f09dd390d712fa2d72dd2599feba6.tar.xz | |
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 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -204,7 +204,7 @@ SCRIPT_SH = \ git-fetch.sh \ git-ls-remote.sh \ git-merge-one-file.sh git-mergetool.sh git-parse-remote.sh \ - git-pull.sh git-rebase.sh \ + git-pull.sh git-rebase.sh git-rebase--interactive.sh \ git-repack.sh git-request-pull.sh git-reset.sh \ git-sh-setup.sh \ git-tag.sh git-verify-tag.sh \ |