summaryrefslogtreecommitdiff
path: root/Documentation/technical/trivial-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-11-11 13:56:31 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-11-11 13:56:31 -0800
commit12133d52c1948d80a87c360a3265658d7345489f (patch)
treecc5ee69a76b82ccdc2160dca318fcd2ad74c12e3 /Documentation/technical/trivial-merge.txt
parentMerge branch 'js/pwd-var-vs-pwd-cmd-fix' (diff)
parentdoc: fix location of 'info/' with $GIT_COMMON_DIR (diff)
downloadtgif-12133d52c1948d80a87c360a3265658d7345489f.tar.xz
Merge branch 'ps/common-info-doc'
Doc fix. * ps/common-info-doc: doc: fix location of 'info/' with $GIT_COMMON_DIR
Diffstat (limited to 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions