summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-18 03:31:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-18 03:31:18 (GMT)
commita8f6b201aadcadeb9bfe05a66de32878bff800f7 (patch)
treeba35e286f47a53af3b08bbb1d5546b461b4fb8f4 /merge-recursive.c
parentc84c483ffdfc45d8143fd6f6620361aba91d1080 (diff)
parentb59012ef4e7dde1895d988736c7df64f68b1e940 (diff)
downloadgit-a8f6b201aadcadeb9bfe05a66de32878bff800f7.zip
git-a8f6b201aadcadeb9bfe05a66de32878bff800f7.tar.gz
git-a8f6b201aadcadeb9bfe05a66de32878bff800f7.tar.bz2
Merge branch 'br/gitweb'
* br/gitweb: gitweb: Use the config file to set repository owner's name.
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions