diff options
| author | Elia Pinto <gitter.spiros@gmail.com> | 2014-06-06 07:55:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-09 14:47:06 -0700 |
| commit | 57b74cdaba2aaaee7d29838a7e6f3ed5581b1992 (patch) | |
| tree | f7633b003d9e1707d44fc38c8018d4fed7526609 /contrib/examples/git-resolve.sh | |
| parent | contrib/examples/git-commit.sh: avoid "test <cond> -a/-o <cond>" (diff) | |
| download | git-57b74cdaba2aaaee7d29838a7e6f3ed5581b1992.tar.gz git-57b74cdaba2aaaee7d29838a7e6f3ed5581b1992.zip | |
contrib/examples/git-merge.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-resolve.sh')
0 files changed, 0 insertions, 0 deletions