diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-24 19:21:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-24 19:21:45 (GMT) |
| commit | 4b64c8a1eea6b44fb8505ec46cccf8255c7e6c63 (patch) | |
| tree | 09b7be5b4670d10c27896b27561382c4dbe73f6f /patch-ids.h | |
| parent | 49ac7358da163b0f8a32ce71723b2071f962d3fd (diff) | |
| parent | d96a275b91bae1800cd43be0651e886e7e042a17 (diff) | |
| download | git-4b64c8a1eea6b44fb8505ec46cccf8255c7e6c63.zip git-4b64c8a1eea6b44fb8505ec46cccf8255c7e6c63.tar.gz git-4b64c8a1eea6b44fb8505ec46cccf8255c7e6c63.tar.bz2 | |
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
Diffstat (limited to 'patch-ids.h')
0 files changed, 0 insertions, 0 deletions