提交 1164db97 编写于 作者: R Remi Lespinet 提交者: Junio C Hamano

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: NRemi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 3d4a3ffe
......@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册