summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-12-21 14:30:19 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-12-21 14:30:19 -0800
commit41cd7974b0b67b78c39bccc86718dbe19390f768 (patch)
treeb76bbad20d6050e0f7bad5f9be7eb19430ee9074 /merge-recursive.h
parentMerge branch 'jn/maint-gitweb-pathinfo-fix' (diff)
parentget_sha1: handle special case $commit^{/} (diff)
downloadtgif-41cd7974b0b67b78c39bccc86718dbe19390f768.tar.xz
Merge branch 'nd/oneline-sha1-name-from-specific-ref'
* nd/oneline-sha1-name-from-specific-ref: get_sha1: handle special case $commit^{/} get_sha1: support $commit^{/regex} syntax get_sha1_oneline: make callers prepare the commit list to traverse get_sha1_oneline: fix lifespan rule of temp_commit_buffer variable
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions