summaryrefslogtreecommitdiff
path: root/builtin/fmt-merge-msg.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-03-26 20:13:16 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-03-26 20:13:16 -0700
commit4d46ee74e11416e7edf6624611242fe2f98f078c (patch)
tree68504e315fd1cfeb0a8308285a7fd8148f32322b /builtin/fmt-merge-msg.c
parentMerge branch 'jc/maint-rerere-in-workdir' (diff)
parentcheckout: tweak detached-orphan warning format (diff)
downloadtgif-4d46ee74e11416e7edf6624611242fe2f98f078c.tar.xz
Merge branch 'jk/checkout-orphan-warning'
* jk/checkout-orphan-warning: checkout: tweak detached-orphan warning format checkout: clear commit marks after detached-orphan check checkout: add basic tests for detached-orphan warning
Diffstat (limited to 'builtin/fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions