summaryrefslogtreecommitdiff
path: root/builtin/am.c
diff options
context:
space:
mode:
authorRemi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>2015-08-04 14:19:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-08-05 05:02:11 (GMT)
commite97a5e765db06995c3b027a5d7dceb6b4f2cba02 (patch)
treed71ed7a58af0117f5e84fbf3544128a59ed18ac1 /builtin/am.c
parent783d7e865ec8f6190f8d3abe3ab72a9410d611f1 (diff)
downloadgit-e97a5e765db06995c3b027a5d7dceb6b4f2cba02.zip
git-e97a5e765db06995c3b027a5d7dceb6b4f2cba02.tar.gz
git-e97a5e765db06995c3b027a5d7dceb6b4f2cba02.tar.bz2
git-am: add am.threeWay config variable
Add the am.threeWay configuration variable to use the -3 or --3way option of git am by default. When am.threeway is set and not desired for a specific git am command, the --no-3way option can be used to override it. Signed-off-by: Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr> Signed-off-by: Paul Tan <pyokagan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 84d57d4..1399c8d 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);