diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-04-21 10:42:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-21 10:42:42 -0700 |
| commit | 0e6e1a5fbdd3143b74bf45f009bb4e850bdc785a (patch) | |
| tree | 01e676502b1bd1c4a84aa3d3ebbb62d6d75eba37 /contrib/examples/git-merge.sh | |
| parent | cc291953df19aa4a97bee3590e708dc1fc557500 (diff) | |
| parent | bd368a9baf5a42e2076ef4c8a35312ccab171452 (diff) | |
| download | git-0e6e1a5fbdd3143b74bf45f009bb4e850bdc785a.tar.gz git-0e6e1a5fbdd3143b74bf45f009bb4e850bdc785a.tar.xz | |
Merge branch 'ep/shell-command-substitution'
* ep/shell-command-substitution:
t9362-mw-to-git-utf8.sh: use the $( ... ) construct for command substitution
t9360-mw-to-git-clone.sh: use the $( ... ) construct for command substitution
git-tag.sh: use the $( ... ) construct for command substitution
git-revert.sh: use the $( ... ) construct for command substitution
git-resolve.sh: use the $( ... ) construct for command substitution
git-repack.sh: use the $( ... ) construct for command substitution
git-merge.sh: use the $( ... ) construct for command substitution
git-ls-remote.sh: use the $( ... ) construct for command substitution
git-fetch.sh: use the $( ... ) construct for command substitution
git-commit.sh: use the $( ... ) construct for command substitution
git-clone.sh: use the $( ... ) construct for command substitution
git-checkout.sh: use the $( ... ) construct for command substitution
install-webdoc.sh: use the $( ... ) construct for command substitution
howto-index.sh: use the $( ... ) construct for command substitution
Diffstat (limited to 'contrib/examples/git-merge.sh')
| -rwxr-xr-x | contrib/examples/git-merge.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh index a5e42a9f0..7e40f40c7 100755 --- a/contrib/examples/git-merge.sh +++ b/contrib/examples/git-merge.sh @@ -341,7 +341,7 @@ case "$use_strategies" in '') case "$#" in 1) - var="`git config --get pull.twohead`" + var="$(git config --get pull.twohead)" if test -n "$var" then use_strategies="$var" @@ -349,7 +349,7 @@ case "$use_strategies" in use_strategies="$default_twohead_strategies" fi ;; *) - var="`git config --get pull.octopus`" + var="$(git config --get pull.octopus)" if test -n "$var" then use_strategies="$var" |