Skip to content

Commit 1164db9

Browse files
Awaryngitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 3d4a3ff commit 1164db9

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

git-am.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,7 @@ committer_date_is_author_date=
378378
ignore_date=
379379
allow_rerere_autoupdate=
380380
gpg_sign_opt=
381+
threeway=
381382

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

0 commit comments

Comments
 (0)