Merge branch 'tr/workflow-doc'
authorJunio C Hamano <gitster@pobox.com>
Sun, 19 Oct 2008 23:07:23 +0000 (16:07 -0700)
committerJunio 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

1  2 
Documentation/git-commit.txt
Documentation/git-rebase.txt

Simple merge
Simple merge