summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-12-01 09:04:30 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-12-01 09:04:30 -0800
commitecbddd16bb2c725ad2305fd911bf237d845c862b (patch)
tree65997c75182949afad32cc2593e148cf65568f33 /Documentation/git-merge-file.txt
parentMerge branch 'sg/blame-indent-heuristics-is-now-the-default' (diff)
parenthelp: add gitsubmodules to the list of guides (diff)
downloadtgif-ecbddd16bb2c725ad2305fd911bf237d845c862b.tar.xz
Merge branch 'pb/help-list-gitsubmodules-among-guides'
Help update. * pb/help-list-gitsubmodules-among-guides: help: add gitsubmodules to the list of guides
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions