summaryrefslogtreecommitdiff
path: root/http-push.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-06-21 04:51:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-06-21 04:51:13 (GMT)
commita49eb197d809d2d7efbd81d935c61e1a0caa983e (patch)
tree06512c227fba59faaee57dcfe1ba71f049c4d0a7 /http-push.c
parentc28a17f270a51a4ed5e432e83c0ed962361a37c9 (diff)
parent42b491786260eb17d97ea9fb1c4b70075bca9523 (diff)
downloadgit-a49eb197d809d2d7efbd81d935c61e1a0caa983e.zip
git-a49eb197d809d2d7efbd81d935c61e1a0caa983e.tar.gz
git-a49eb197d809d2d7efbd81d935c61e1a0caa983e.tar.bz2
Merge branch 'ph/submodule-rebase'
* ph/submodule-rebase: git-submodule: add support for --merge. Conflicts: Documentation/git-submodule.txt git-submodule.sh
Diffstat (limited to 'http-push.c')
0 files changed, 0 insertions, 0 deletions