git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 384a8b2)
am: remember --rerere-autoupdate setting
authorPhillip Wood <redacted>
Wed, 2 Aug 2017 10:44:15 +0000 (11:44 +0100)
committerJunio C Hamano <redacted>
Wed, 2 Aug 2017 22:16:09 +0000 (15:16 -0700)
commitfd4a3f486d97682a0f42dfc84fe7af742bd76230
tree3fc420bf052dfdeaf88e3563e12d9deb8eb356b8tree | snapshot
parent384a8b271c076693d00c97184b5c41ab3a95e64dcommit | diff
am: remember --rerere-autoupdate setting

Save the rerere-autoupdate setting so that it is remembered after
stopping for the user to resolve conflicts.

Signed-off-by: Phillip Wood <redacted>
Signed-off-by: Junio C Hamano <redacted>
builtin/am.c diff | blob | history
git clone https://git.99rst.org/PROJECT