diff options
| author | Michael Forney <mforney@mforney.org> | 2017-08-04 23:49:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-07 12:04:45 -0700 |
| commit | 974ce8078c9a91190d798eaa65c9f173dd50c3f8 (patch) | |
| tree | 3ddccb020fb3ba10fbf1e55b1ebc9f2f6ff1b4bd /git-merge-octopus.sh | |
| parent | 4384e3cde2ce8ecd194202e171ae16333d241326 (diff) | |
| download | git-974ce8078c9a91190d798eaa65c9f173dd50c3f8.tar.gz | |
scripts: use "git foo" not "git-foo"mf/no-dashed-subcommands
We want to make sure that people who copy & paste code would see
fewer instances of "git-foo". The use of these dashed forms have
been discouraged since v1.6.0 days.
Signed-off-by: Michael Forney <mforney@mforney.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
| -rwxr-xr-x | git-merge-octopus.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh index bcf0d92ec2..6c390d6c22 100755 --- a/git-merge-octopus.sh +++ b/git-merge-octopus.sh @@ -100,7 +100,7 @@ do if test $? -ne 0 then gettextln "Simple merge did not work, trying automatic merge." - git-merge-index -o git-merge-one-file -a || + git merge-index -o git-merge-one-file -a || OCTOPUS_FAILURE=1 next=$(git write-tree 2>/dev/null) fi |