summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-07-01 19:40:54 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-07-01 19:40:54 -0700
commit59773c7e583b1dcf4b63c4ee222b79cef460456b (patch)
tree35275079bb399b2a212ee991a7263d1dacee91d1 /Documentation/git-merge.txt
parentMerge branch 'sb/quiet-porcelains' (diff)
parentgit-remote: fix missing .uploadpack usage for show command (diff)
downloadtgif-59773c7e583b1dcf4b63c4ee222b79cef460456b.tar.xz
Merge branch 'cf/maint-remote-uploadpack-useconfig-fix'
* cf/maint-remote-uploadpack-useconfig-fix: git-remote: fix missing .uploadpack usage for show command
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions