]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3d4a3ff) | patch
git-am.sh: fix initialization of the threeway variable
authorRemi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>
Thu, 4 Jun 2015 15:04:53 +0000 (17:04 +0200)
committerJunio C Hamano <gitster@pobox.com>
Thu, 4 Jun 2015 17:39:23 +0000 (10:39 -0700)
commit1164db977e3c2dd54a4d90d4aded7ca64791d16b
tree6e8c1be9ebb607ca3a7ffd33335bbff44e1df831tree | snapshot
parent3d4a3ffe64162b45ae7c991fc60623ecb4678cfdcommit | diff
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>
git-am.sh diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.