| commit | 4b64c8a1eea6b44fb8505ec46cccf8255c7e6c63 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 24 Jun 2015 19:21:45 +0000 (24 12:21 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 24 Jun 2015 19:21:45 +0000 (24 12:21 -0700) | ||
| tree | 09b7be5b4670d10c27896b27561382c4dbe73f6f | treesnapshot (tar.gz zip) |
| parent | 49ac7358da163b0f8a32ce71723b2071f962d3fd | commitdiff |
| parent | d96a275b91bae1800cd43be0651e886e7e042a17 | commitdiff |
Merge branch 'rl/am-3way-config'
"git am" learned am.threeWay configuration variable.
* rl/am-3way-config:
git-am: add am.threeWay config variable
t4150-am: refactor am -3 tests
git-am.sh: fix initialization of the threeway variable
"git am" learned am.threeWay configuration variable.
* rl/am-3way-config:
git-am: add am.threeWay config variable
t4150-am: refactor am -3 tests
git-am.sh: fix initialization of the threeway variable
| Documentation/config.txt | diff1 | diff2 | blobhistory |
| git-am.sh | diff1 | diff2 | blobhistory |