diff options
author | Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr> | 2015-06-04 17:04:53 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-06-04 10:39:23 -0700 |
commit | 1164db977e3c2dd54a4d90d4aded7ca64791d16b (patch) | |
tree | 6e8c1be9ebb607ca3a7ffd33335bbff44e1df831 | |
parent | Git 2.4 (diff) | |
download | tgif-1164db977e3c2dd54a4d90d4aded7ca64791d16b.tar.xz |
git-am.sh: fix initialization of the threeway variable
Initialization for the threeway variable was missing. This caused
a behavior change for command lines like:
threeway=t git am ...
This commit adds initialization for this variable.
Signed-off-by: Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-x | git-am.sh | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -378,6 +378,7 @@ committer_date_is_author_date= ignore_date= allow_rerere_autoupdate= gpg_sign_opt= +threeway= if test "$(git config --bool --get am.messageid)" = true then |