Andrew's git / gitweb.git / diff
?
am: remember --rerere-autoupdate setting
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Wed, 2 Aug 2017 10:44:15 +0000 (11:44 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 2 Aug 2017 22:16:09 +0000 (15:16 -0700)
Save the rerere-autoupdate setting so that it is remembered after
stopping for the user to resolve conflicts.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found