summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorRemi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>2015-06-04 15:04:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-04 17:39:23 (GMT)
commit1164db977e3c2dd54a4d90d4aded7ca64791d16b (patch)
tree6e8c1be9ebb607ca3a7ffd33335bbff44e1df831 /git-am.sh
parent3d4a3ffe64162b45ae7c991fc60623ecb4678cfd (diff)
downloadgit-1164db977e3c2dd54a4d90d4aded7ca64791d16b.zip
git-1164db977e3c2dd54a4d90d4aded7ca64791d16b.tar.gz
git-1164db977e3c2dd54a4d90d4aded7ca64791d16b.tar.bz2
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>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-am.sh b/git-am.sh
index a67d0f9..4696998 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -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