]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 49ac735 d96a275)
Merge branch 'rl/am-3way-config'
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Jun 2015 19:21:45 +0000 (12:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Jun 2015 19:21:45 +0000 (12:21 -0700)
commit4b64c8a1eea6b44fb8505ec46cccf8255c7e6c63
tree09b7be5b4670d10c27896b27561382c4dbe73f6ftree | snapshot
parent49ac7358da163b0f8a32ce71723b2071f962d3fdcommit | diff
parentd96a275b91bae1800cd43be0651e886e7e042a17commit | diff
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
Documentation/config.txt diff1 | diff2 | blob | history
git-am.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.