summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge-ours.sh
diff options
context:
space:
mode:
authorElia Pinto <gitter.spiros@gmail.com>2014-06-06 14:55:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-06-09 21:47:06 (GMT)
commit0783df5d2603c97a481be839bdc65088787dde1b (patch)
tree29956712323d5d1a86003de812edbeac65f07c53 /contrib/examples/git-merge-ours.sh
parentcb9d69ad638fe34d214cf9cb2850e38be6e6d639 (diff)
downloadgit-0783df5d2603c97a481be839bdc65088787dde1b.zip
git-0783df5d2603c97a481be839bdc65088787dde1b.tar.gz
git-0783df5d2603c97a481be839bdc65088787dde1b.tar.bz2
contrib/examples/git-commit.sh: avoid "test <cond> -a/-o <cond>"
The construct is error-prone; "test" being built-in in most modern shells, the reason to avoid "test <cond> && test <cond>" spawning one extra process by using a single "test <cond> -a <cond>" no longer exists. 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 'contrib/examples/git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions