summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-10-27 08:23:29 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-10-29 10:17:03 +0900
commit5f5a5fca541415b7bb9b3926d671ca4ecbf144d8 (patch)
tree6cfeb99ea7760a350de12b0e666bab792845c563 /Documentation/git-merge.txt
parentconfig.txt: move rebase-config.txt to config/ (diff)
downloadtgif-5f5a5fca541415b7bb9b3926d671ca4ecbf144d8.tar.xz
config.txt: move receive-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>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions