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 /git-am.sh | |
| parent | 49ac7358da163b0f8a32ce71723b2071f962d3fd (diff) | |
| parent | d96a275b91bae1800cd43be0651e886e7e042a17 (diff) | |
| download | git-4b64c8a1eea6b44fb8505ec46cccf8255c7e6c63.tar.gz | |
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 'git-am.sh')
| -rwxr-xr-x | git-am.sh | 10 |
1 files changed, 10 insertions, 0 deletions
@@ -378,6 +378,7 @@ committer_date_is_author_date= ignore_date= allow_rerere_autoupdate= gpg_sign_opt= +threeway= if test "$(git config --bool --get am.messageid)" = true then @@ -389,6 +390,11 @@ then keepcr=t fi +if test "$(git config --bool --get am.threeWay)" = true +then + threeway=t +fi + while test $# != 0 do case "$1" in @@ -400,6 +406,8 @@ it will be removed. Please do not use it anymore." ;; -3|--3way) threeway=t ;; + --no-3way) + threeway=f ;; -s|--signoff) sign=t ;; -u|--utf8) @@ -657,6 +665,8 @@ fi if test "$(cat "$dotest/threeway")" = t then threeway=t +else + threeway=f fi git_apply_opt=$(cat "$dotest/apply-opt") if test "$(cat "$dotest/sign")" = t |