From: Stephen Boyd Date: Mon, 26 Oct 2009 20:31:55 GMT Subject: [PATCH 1/2] completion: ignore custom merge strategies when pre-generating Message-ID: <1256589116-6998-2-git-send-email-bebarino@gmail.com> In-Reply-To: <1256589116-6998-1-git-send-email-bebarino@gmail.com> Since the Makefile adds the build directory to PATH, we get the merge strategies twice. Ignore custom merge strategies which are just the builtin merge strategies (octopus.sh, ours.sh, etc.) anyway. Signed-off-by: Stephen Boyd --- contrib/completion/git-completion.bash.generate | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/contrib/completion/git-completion.bash.generate b/contrib/completion/git-completion.bash.generate index 6487fd5..b66254a 100755 --- a/contrib/completion/git-completion.bash.generate +++ b/contrib/completion/git-completion.bash.generate @@ -9,6 +9,7 @@ __git_merge_strategies () { git merge -s help 2>&1 | sed -n -e '/[Aa]vailable strategies are: /,/^$/{ + /^[Aa]vailable custom strategies are: / d s/\.$// s/.*:// s/^[ ]*// -- 1.6.5.2.181.gd6f41