[PATCH/RFC v3 1/4] git-am.sh: fix initialization of the threeway variable

From: Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>
Date: Jun 2, 2015, 17:34 UTC
Message-ID: <1433266446-2845-1-git-send-email-remi.lespinet@ensimag.grenoble-inp.fr>

Initialization for the threeway variable was missing. This caused a behavior change for command lines like:

	threeway=t git am ...

This commit fixes the bug.

Signed-off-by: Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>
---
 git-am.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/git-am.sh b/git-am.sh
index 761befb..c460dd0 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

-- 
1.9.1