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)
commit310d188f7e1d1fbbeace17d5c62e422fd0b5a824
tree03b67c95d2c1813e551966fd2526a0e42495e8e9
parentadcb2e0f466aa39cc5f15d5a76d1151f6c47daf2
parentf948dd899210e5a51cd716245affb7c121bf8791
Merge branch 'tr/workflow-doc'

* 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/git-commit.txt
Documentation/git-rebase.txt