summaryrefslogtreecommitdiff
path: root/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-11-02 13:36:14 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-11-02 13:36:14 -0800
commit581000a4196d196d221bb6164a49a8a52ce30730 (patch)
treed177274e6739292d466213fc02abf5811bf86ce6 /merge-file.c
parentStart 1.6.0.4 cycle (diff)
parentEnhance hold_lock_file_for_{update,append}() API (diff)
downloadtgif-581000a4196d196d221bb6164a49a8a52ce30730.tar.xz
Merge branch 'jc/maint-co-track' into maint
* 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
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions