diff options
| author |  Phillip Wood <phillip.wood@dunelm.org.uk> | 2017-08-02 11:44:15 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-08-02 15:16:09 -0700 |
| commit | fd4a3f486d97682a0f42dfc84fe7af742bd76230 (patch) | |
| tree | 3fc420bf052dfdeaf88e3563e12d9deb8eb356b8 /t/t4013/diff.diff-tree_--pretty_--patch-with-stat_side | |
| parent | Merge tag 'l10n-2.14.0-rnd2' of git://github.com/git-l10n/git-po (diff) | |
| download | tgif-fd4a3f486d97682a0f42dfc84fe7af742bd76230.tar.xz | |
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>
Diffstat (limited to 't/t4013/diff.diff-tree_--pretty_--patch-with-stat_side')
0 files changed, 0 insertions, 0 deletions