![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 22 Jul 2011 21:44:08 +0000 (14:44 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 22 Jul 2011 21:44:08 +0000 (14:44 -0700) |
* mz/doc-rebase-abort:
rebase: clarify "restore the original branch"
rebase: clarify "restore the original branch"
| 1 | 2 | |||
|---|---|---|---|---|
| Documentation/git-rebase.txt | patch | | diff1 | | diff2 | | blob | history |
| git-rebase.sh | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/git-rebase.txt
Simple merge
diff --cc git-rebase.sh
Simple merge