summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-one-file.txt
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2018-04-29 00:44:35 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-04-30 11:12:30 +0900
commitfb40429109723c0d8ec77ba81421f508ac2532a0 (patch)
tree17b51ed573a61474b80f0a8da0d953ef042835fb /Documentation/git-merge-one-file.txt
parentreplace: prepare create_graft() for converting graft files wholesale (diff)
downloadtgif-fb40429109723c0d8ec77ba81421f508ac2532a0.tar.xz
replace: introduce --convert-graft-file
This option is intended to help with the transition away from the now-deprecated graft file. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions