| commit | 60b188a9844cdcf865174c685a38acc053a9d43b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 27 Feb 2008 21:02:57 +0000 (27 13:02 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 27 Feb 2008 21:02:57 +0000 (27 13:02 -0800) | ||
| tree | b2ad8b5b4b20785ea137fa0ec5a11cb0b8517d8c | treesnapshot (tar.gz zip) |
| parent | 5a4d707a6d914fcea302e299fc18892d9e42c767 | commitdiff |
| parent | 572fc81d21b26d856dd3c2cc366b7452a4ed16e4 | commitdiff |
Merge branch 'js/branch-track'
* js/branch-track:
doc: documentation update for the branch track changes
branch: optionally setup branch.*.merge from upstream local branches
Conflicts:
Documentation/config.txt
Documentation/git-branch.txt
Documentation/git-checkout.txt
builtin-branch.c
cache.h
t/t7201-co.sh
* js/branch-track:
doc: documentation update for the branch track changes
branch: optionally setup branch.*.merge from upstream local branches
Conflicts:
Documentation/config.txt
Documentation/git-branch.txt
Documentation/git-checkout.txt
builtin-branch.c
cache.h
t/t7201-co.sh