summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-10-30 20:07:33 -0700
committerJunio C Hamano <gitster@pobox.com>2009-10-30 20:07:33 -0700
commit68d00fd83421a0494c66512e4c66829f4863693d (patch)
tree4f902d832bc56a06b870741f6b632f5cd7c9cde2 /merge-recursive.c
parent97d484bea211f6d16c52d153ae02ea7a42668330 (diff)
parent1ba447b8dc2ec4e6c8ebbbdaa449f38edc29ad3f (diff)
downloadgit-68d00fd83421a0494c66512e4c66829f4863693d.tar.gz
Merge branch 'jn/show-normalized-refs'
* jn/show-normalized-refs: check-ref-format: simplify --print implementation git check-ref-format --print Add tests for git check-ref-format Conflicts: Documentation/git-check-ref-format.txt
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions