summaryrefslogtreecommitdiff
path: root/test-parse-options.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-06-29 17:03:10 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-06-29 17:03:10 -0700
commit0faf247485c2dc92fd8b492a5c4b49237e0338ee (patch)
tree11dd5084b96ee09a38257693a6a29cbb6b3ab081 /test-parse-options.c
parentMerge branch 'jk/combine-diff-binary-etc' (diff)
parentcheckout: make advice when reattaching the HEAD less loud (diff)
downloadtgif-0faf247485c2dc92fd8b492a5c4b49237e0338ee.tar.xz
Merge branch 'jc/advice-about-to-lose-commit'
* jc/advice-about-to-lose-commit: checkout: make advice when reattaching the HEAD less loud Conflicts: builtin/checkout.c
Diffstat (limited to 'test-parse-options.c')
0 files changed, 0 insertions, 0 deletions