diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-10-20 01:07:23 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-10-20 01:07:23 +0200 |
commit | 310d188f7e1d1fbbeace17d5c62e422fd0b5a824 (patch) | |
tree | 03b67c95d2c1813e551966fd2526a0e42495e8e9 /git-merge-octopus.sh | |
parent | Merge branch 'mv/clonev' (diff) | |
parent | Documentation: add manpage about workflows (diff) | |
download | git-310d188f7e1d1fbbeace17d5c62e422fd0b5a824.tar.xz git-310d188f7e1d1fbbeace17d5c62e422fd0b5a824.zip |
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
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions