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 /Documentation/git-prune.txt | |
parent | Merge branch 'jc/diffcore' (diff) | |
parent | Teach rebase -i about --preserve-merges (diff) | |
download | tgif-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 'Documentation/git-prune.txt')
0 files changed, 0 insertions, 0 deletions