diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-24 12:21:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-24 12:21:45 -0700 |
| commit | 4b64c8a1eea6b44fb8505ec46cccf8255c7e6c63 (patch) | |
| tree | 09b7be5b4670d10c27896b27561382c4dbe73f6f /commit.c | |
| parent | Merge branch 'jc/ll-merge-expose-path' (diff) | |
| parent | git-am: add am.threeWay config variable (diff) | |
| download | git-4b64c8a1eea6b44fb8505ec46cccf8255c7e6c63.tar.gz git-4b64c8a1eea6b44fb8505ec46cccf8255c7e6c63.zip | |
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 'commit.c')
0 files changed, 0 insertions, 0 deletions