kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Remi Lespinet 2015-06-04 17:04:53 +02:00 committed by Junio C Hamano
parent 3d4a3ffe64
commit 1164db977e
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
git-am.sh
View File

@ -378,6 +378,7 @@ committer_date_is_author_date=
ignore_date= ignore_date=
allow_rerere_autoupdate= allow_rerere_autoupdate=
gpg_sign_opt= gpg_sign_opt=
threeway=


if test "$(git config --bool --get am.messageid)" = true if test "$(git config --bool --get am.messageid)" = true
then then