summaryrefslogtreecommitdiff
path: root/builtin-show-branch.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-09-07 22:44:45 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-09-07 22:44:45 -0700
commit11bd3ddb913afd9665e7e822ea54be4fc8d2d5ea (patch)
tree1b15bd04ca47863855c045b34dd69728be98a84b /builtin-show-branch.c
parentTeach "git diff -p" to locate PHP class methods (diff)
parentcheckout: do not check out unmerged higher stages randomly (diff)
downloadtgif-11bd3ddb913afd9665e7e822ea54be4fc8d2d5ea.tar.xz
Merge branch 'jc/maint-checkout-fix'
* jc/maint-checkout-fix: checkout: do not check out unmerged higher stages randomly Conflicts: t/t7201-co.sh
Diffstat (limited to 'builtin-show-branch.c')
0 files changed, 0 insertions, 0 deletions