summaryrefslogtreecommitdiff
path: root/resolve-undo.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-06-29 17:03:12 -0700
committerJunio C Hamano <gitster@pobox.com>2011-06-29 17:03:12 -0700
commitb985f2aecaa6358b55d545385d0624d76ff83fb8 (patch)
treefb28f7e7a9463b659c61379fe61e0270bc7d7f08 /resolve-undo.h
parent187e902dd25da5a9f48f35a48e6281faa2f8ac39 (diff)
parentc17b229454ac3f5d20fd0cff3a663b03c13cb38e (diff)
downloadgit-b985f2aecaa6358b55d545385d0624d76ff83fb8.tar.gz
Merge branch 'jc/maint-1.7.3-checkout-describe'
* jc/maint-1.7.3-checkout-describe: checkout -b <name>: correctly detect existing branch
Diffstat (limited to 'resolve-undo.h')
0 files changed, 0 insertions, 0 deletions