summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Elia Pinto <gitter.spiros@gmail.com>2014-04-16 10:29:49 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-04-17 11:14:59 -0700
commit346b54dbc92bb3c928d326da9d8addf5eb50acce (patch)
tree2edf77c85e33dd79e61fe0937ae6832892aff42d /builtin/merge-ours.c
parentgit-clone.sh: use the $( ... ) construct for command substitution (diff)
downloadtgif-346b54dbc92bb3c928d326da9d8addf5eb50acce.tar.xz
git-commit.sh: use the $( ... ) construct for command substitution
The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular, embedded command substitutions and/or the use of double quotes require careful escaping with the backslash character. The patch was generated by: for _f in $(find . -name "*.sh") do sed -i 's@`\(.*\)`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions