| commit | fd4a3f486d97682a0f42dfc84fe7af742bd76230 | |
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | |
| Wed, 2 Aug 2017 10:44:15 +0000 (2 11:44 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 2 Aug 2017 22:16:09 +0000 (2 15:16 -0700) | ||
| tree | 3fc420bf052dfdeaf88e3563e12d9deb8eb356b8 | treesnapshot (tar.gz zip) |
| parent | 384a8b271c076693d00c97184b5c41ab3a95e64d | commitdiff |
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 <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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>
| builtin/am.c | diffblobblamehistory |