Merge branch 'jk/complete-merge-base'

gitster · gitster · commit ba98a2f6604f · 2014-01-27T10:43:55.000-08:00
* jk/complete-merge-base:
  completion: handle --[no-]fork-point options to git-rebase
  completion: complete merge-base options
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
@@ -1499,6 +1499,12 @@ _git_mergetool ()
 
 _git_merge_base ()
 {
+	case "$cur" in
+	--*)
+		__gitcomp "--octopus --independent --is-ancestor --fork-point"
+		return
+		;;
+	esac
 	__gitcomp_nl "$(__git_refs)"
 }
 
@@ -1631,7 +1637,7 @@ _git_rebase ()
 			--preserve-merges --stat --no-stat
 			--committer-date-is-author-date --ignore-date
 			--ignore-whitespace --whitespace=
-			--autosquash
+			--autosquash --fork-point --no-fork-point
 			"
 
 		return

Original file line number	Diff line number	Diff line change
`@@ -1499,6 +1499,12 @@ _git_mergetool ()`
`1499`	`1499`
`1500`	`1500`	`_git_merge_base ()`
`1501`	`1501`	`{`
	`1502`	`+ case "$cur" in`
	`1503`	`+ --*)`
	`1504`	`+ __gitcomp "--octopus --independent --is-ancestor --fork-point"`
	`1505`	`+ return`
	`1506`	`+ ;;`
	`1507`	`+ esac`
`1502`	`1508`	`__gitcomp_nl "$(__git_refs)"`
`1503`	`1509`	`}`
`1504`	`1510`
`@@ -1631,7 +1637,7 @@ _git_rebase ()`
`1631`	`1637`	`--preserve-merges --stat --no-stat`
`1632`	`1638`	`--committer-date-is-author-date --ignore-date`
`1633`	`1639`	`--ignore-whitespace --whitespace=`
`1634`		`- --autosquash`
	`1640`	`+ --autosquash --fork-point --no-fork-point`
`1635`	`1641`	`"`
`1636`	`1642`
`1637`	`1643`	`return`