These patches just add some simple completions for merging.
Lee Marlow (2):

  bash completion: Add completion for 'git mergetool'

  bash completion: Add '--merge' long option for 'git log'
 contrib/completion/git-completion.bash |   21 +++++++++++++++++++++

 1 files changed, 21 insertions(+), 0 deletions(-)
--

The --tool= long option can be completed with

	kdiff3 tkdiff meld xxdiff emerge

	vimdiff gvimdiff ecmerge opendiff
Signed-off-by: Lee Marlow <lee.marlow@gmail.com>

---

 contrib/completion/git-completion.bash |   20 ++++++++++++++++++++

 1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash

index 78189c1..4089670 100755

--- a/contrib/completion/git-completion.bash

+++ b/contrib/completion/git-completion.bash

@@ -1001,6 +1001,25 @@ _git_merge ()

 	__gitcomp "$(__git_refs)"

 }
+_git_mergetool ()

+{

+	local cur="${COMP_WORDS[COMP_CWORD]}"

+	case "$cur" in

+	--tool=*)

+		__gitcomp "

+			kdiff3 tkdiff meld xxdiff emerge

+			vimdiff gvimdiff ecmerge opendiff

+			" "" "${cur##--tool=}"

+		return

+		;;

+	--*)

+		__gitcomp "--tool="

+		return

+		;;

+	esac

+	COMPREPLY=()

+}

+

 _git_merge_base ()

 {

 	__gitcomp "$(__git_refs)"

@@ -1650,6 +1669,7 @@ _git ()

 	ls-remote)   _git_ls_remote ;;

 	ls-tree)     _git_ls_tree ;;

 	merge)       _git_merge;;

+	mergetool)   _git_mergetool;;

 	merge-base)  _git_merge_base ;;

 	mv)          _git_mv ;;

 	name-rev)    _git_name_rev ;;

--

1.6.0.rc3.6.ga0653
--

Acked-by: Shawn O. Pearce <spearce@spearce.org>
... for both patches in this series.  But this is new functionality
--

Shawn.

--

Heh, you are too cautious ;-)
Both "log --merge" and mergetool have been with us for quite some time,

and I certainly do not mind taking [2/2] if not both.

--

I think both are fine to include in 1.6.0 if you are willing to

apply them there.  Its pretty low risk, but at this point the

bash completion has gone from "minor fun toy" to "major part of

the git-core suite which all of the distros link into their bash

completion loading".  IMHO its long out-grown its contrib status.
--

Shawn.

--

Signed-off-by: Lee Marlow <lee.marlow@gmail.com>

---

 contrib/completion/git-completion.bash |    1 +

 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash

index 4089670..bdf4f4a 100755

--- a/contrib/completion/git-completion.bash

+++ b/contrib/completion/git-completion.bash

@@ -972,6 +972,7 @@ _git_log ()

 			--decorate --diff-filter=

 			--color-words --walk-reflogs

 			--parents --children --full-history

+			--merge

 			"

 		return

 		;;

--

1.6.0.rc3.6.ga0653
--