summaryrefslogtreecommitdiff
path: root/Documentation/config/showbranch.txt
diff options
context:
space:
mode:
authorLibravatar Philippe Blain <levraiphilippeblain@gmail.com>2021-07-23 12:14:28 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-07-23 15:45:35 -0700
commitfd441eb612b28e2b0f512ad6d98859c9e82a2cbd (patch)
treeb894d916a3a76532a66609ab9d14965dad7947f3 /Documentation/config/showbranch.txt
parentmerge: add missing word "strategy" to a message (diff)
downloadtgif-fd441eb612b28e2b0f512ad6d98859c9e82a2cbd.tar.xz
Documentation: define 'MERGE_AUTOSTASH'
The documentation for 'git merge --abort' and 'git merge --quit' both mention the special ref 'MERGE_AUTOSTASH', but this ref is not formally defined anywhere. Mention it in the description of the '--autostash' option for 'git merge'. Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config/showbranch.txt')
0 files changed, 0 insertions, 0 deletions