]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9938f30) | patch
Documentation: define 'MERGE_AUTOSTASH'
authorPhilippe Blain <levraiphilippeblain@gmail.com>
Fri, 23 Jul 2021 12:14:28 +0000 (12:14 +0000)
committerJunio C Hamano <gitster@pobox.com>
Fri, 23 Jul 2021 22:45:35 +0000 (15:45 -0700)
commitfd441eb612b28e2b0f512ad6d98859c9e82a2cbd
treeb894d916a3a76532a66609ab9d14965dad7947f3tree | snapshot
parent9938f30d13d20026dad2eed7a6b51de25768c858commit | diff
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>
Documentation/merge-options.txt diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.