summaryrefslogtreecommitdiff
path: root/mergetools/p4merge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-07-27 21:11:33 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-07-27 21:11:34 -0700
commit5000caa3069e8627abfaff49c65a7daeb81c17fa (patch)
treea12104039dfb1e55629a4fea6ecf61bf68355020 /mergetools/p4merge
parentMerge branch 'jc/test-lib-source-build-options-early' (diff)
parentcheckout: don't confuse ref and object flags (diff)
downloadtgif-5000caa3069e8627abfaff49c65a7daeb81c17fa.tar.xz
Merge branch 'jk/maint-checkout-orphan-check-fix'
"git checkout <branchname>" to come back from a detached HEAD state incorrectly computed reachability of the detached HEAD, resulting in unnecessary warnings. * jk/maint-checkout-orphan-check-fix: checkout: don't confuse ref and object flags
Diffstat (limited to 'mergetools/p4merge')
0 files changed, 0 insertions, 0 deletions