summaryrefslogtreecommitdiff
path: root/Documentation/git-receive-pack.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-12-05 11:15:52 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-12-05 11:15:52 -0800
commiteb3b8d7658331f4ec5f115d7407393d845644f5e (patch)
tree2ff9a37138583242a41fc213d7e6f47789dc7610 /Documentation/git-receive-pack.txt
parentGit 1.7.8 (diff)
parentDocumentation: fix formatting error in merge-options.txt (diff)
downloadtgif-eb3b8d7658331f4ec5f115d7407393d845644f5e.tar.xz
Merge branch 'js/merge-edit-option'
* js/merge-edit-option: Documentation: fix formatting error in merge-options.txt
Diffstat (limited to 'Documentation/git-receive-pack.txt')
0 files changed, 0 insertions, 0 deletions