| commit | 9b9910d720a5bc6f5ff3df992a9f45bc92a40056 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 Jun 2015 17:37:01 +0000 (11 10:37 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 Jun 2015 17:37:01 +0000 (11 10:37 -0700) | ||
| tree | 1242f358439a2817c980c209c6f262d540631fbc | treesnapshot (tar.gz zip) |
| parent | 5c5fe41199d7253d6ec7f830830aba5a7d886d5b | commitdiff |
| parent | d96a275b91bae1800cd43be0651e886e7e042a17 | commitdiff |
Merge branch 'rl/am-3way-config' into next
"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 |