![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 19 Oct 2008 23:07:23 +0000 (16:07 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 19 Oct 2008 23:07:23 +0000 (16:07 -0700) |
* tr/workflow-doc:
Documentation: add manpage about workflows
Documentation: Refer to git-rebase(1) to warn against rewriting
Documentation: new upstream rebase recovery section in git-rebase
Documentation: add manpage about workflows
Documentation: Refer to git-rebase(1) to warn against rewriting
Documentation: new upstream rebase recovery section in git-rebase
| 1 | 2 | |||
|---|---|---|---|---|
| Documentation/git-commit.txt | patch | | diff1 | | diff2 | | blob | history |
| Documentation/git-rebase.txt | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/git-commit.txt
Simple merge
diff --cc Documentation/git-rebase.txt
Simple merge