summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-08-23 15:19:45 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-08-23 15:19:45 -0700
commitffa69e61d3c5730bd4b65a465efc130b0ef3c7df (patch)
treecb407630cecb82890077897c58e9595c73080b03 /merge-recursive.h
parentMerge branch 'jc/maint-smart-http-race-upload-pack' into maint (diff)
parentreceive-pack: do not overstep command line argument array (diff)
downloadtgif-ffa69e61d3c5730bd4b65a465efc130b0ef3c7df.tar.xz
Merge branch 'cb/maint-quiet-push' into maint
* cb/maint-quiet-push: receive-pack: do not overstep command line argument array propagate --quiet to send-pack/receive-pack Conflicts: Documentation/git-receive-pack.txt Documentation/git-send-pack.txt
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions