projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5a4d707 572fc81)
Merge branch 'js/branch-track'
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Feb 2008 21:02:57 +0000 (13:02 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Feb 2008 21:02:57 +0000 (13:02 -0800)
commit60b188a9844cdcf865174c685a38acc053a9d43b
treeb2ad8b5b4b20785ea137fa0ec5a11cb0b8517d8ctree | snapshot
parent5a4d707a6d914fcea302e299fc18892d9e42c767commit | diff
parent572fc81d21b26d856dd3c2cc366b7452a4ed16e4commit | diff
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
Documentation/config.txt diff1 | diff2 | blob | history
builtin-branch.c diff1 | diff2 | blob | history
builtin-checkout.c diff1 | diff2 | blob | history
cache.h diff1 | diff2 | blob | history
config.c diff1 | diff2 | blob | history
environment.c diff1 | diff2 | blob | history
t/t3200-branch.sh diff1 | diff2 | blob | history
t/t7201-co.sh diff1 | diff2 | blob | history
Git—the stupid content tracker