summaryrefslogtreecommitdiff
path: root/builtin/am.c
diff options
context:
space:
mode:
Diffstat (limited to 'builtin/am.c')
-rw-r--r--builtin/am.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/am.c b/builtin/am.c
index 84d57d4297..1399c8dd88 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -152,6 +152,8 @@ static void am_state_init(struct am_state *state, const char *dir)
state->prec = 4;
+ git_config_get_bool("am.threeway", &state->threeway);
+
state->utf8 = 1;
git_config_get_bool("am.messageid", &state->message_id);