projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6af50f7 acd3b9e)
Merge branch 'jc/maint-co-track'
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Oct 2008 00:58:11 +0000 (17:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Oct 2008 00:58:11 +0000 (17:58 -0700)
commita157400c972bbdeab2b5629658c99839c855f5ab
tree95c9ae9bf86dcc6e2bd4a3b0b217f5bef8622b59tree | snapshot
parent6af50f7536d559f891d08597203ba605726511d6commit | diff
parentacd3b9eca82e38950f94e4708b528b7dae09a7c8commit | diff
Merge branch 'jc/maint-co-track'

* jc/maint-co-track:
  Enhance hold_lock_file_for_{update,append}() API
  demonstrate breakage of detached checkout with symbolic link HEAD
  Fix "checkout --track -b newbranch" on detached HEAD

Conflicts:
builtin-commit.c
branch.c diff1 | diff2 | blob | history
builtin-commit.c diff1 | diff2 | blob | history
builtin-fetch-pack.c diff1 | diff2 | blob | history
builtin-revert.c diff1 | diff2 | blob | history
cache.h diff1 | diff2 | blob | history
refs.c diff1 | diff2 | blob | history
rerere.c diff1 | diff2 | blob | history
sha1_file.c diff1 | diff2 | blob | history
t/t7201-co.sh diff1 | diff2 | blob | history
Git—the stupid content tracker