From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 19 Oct 2008 23:07:23 +0000 (-0700)
Subject: Merge branch 'tr/workflow-doc'
X-Git-Tag: v1.6.1-rc1~126
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=310d188f7e1d1fbbeace17d5c62e422fd0b5a824;p=git.git

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
---

310d188f7e1d1fbbeace17d5c62e422fd0b5a824