]> git.ipfire.org Git - thirdparty/git.git/commit - Documentation/config.txt
config.txt: move merge-config.txt to config/
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Sat, 27 Oct 2018 06:23:19 +0000 (08:23 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Oct 2018 01:17:03 +0000 (10:17 +0900)
commit7fb5ab4a020185c74007ca04ca6f8de9a3ae3868
tree6fb381adefa6734ee8665f12562294e9f998b3a9
parentf7ade6c98045d27039a76691657d2fbf08e527fc
config.txt: move merge-config.txt to config/

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/config.txt
Documentation/config/merge.txt [moved from Documentation/merge-config.txt with 98% similarity]
Documentation/git-merge.txt