diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-21 22:30:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-21 22:30:19 (GMT) |
| commit | 41cd7974b0b67b78c39bccc86718dbe19390f768 (patch) | |
| tree | b76bbad20d6050e0f7bad5f9be7eb19430ee9074 /ll-merge.c | |
| parent | 643b6ef809cdbc47c698b688b0dfe218eca9b474 (diff) | |
| parent | 4322842acfaace812308f8aec0fe39a358f3c6f2 (diff) | |
| download | git-41cd7974b0b67b78c39bccc86718dbe19390f768.zip git-41cd7974b0b67b78c39bccc86718dbe19390f768.tar.gz git-41cd7974b0b67b78c39bccc86718dbe19390f768.tar.bz2 | |
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 'll-merge.c')
0 files changed, 0 insertions, 0 deletions