![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 2 Jul 2007 08:45:47 +0000 (01:45 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 2 Jul 2007 08:45:47 +0000 (01:45 -0700) |
* 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
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
| 1 | 2 | |||
|---|---|---|---|---|
| Makefile | patch | | diff1 | | diff2 | | blob | history |
| git-sh-setup.sh | patch | | diff1 | | diff2 | | blob | history |
diff --cc Makefile
Simple merge
diff --cc git-sh-setup.sh
Simple merge