threads / patch / 35638

patch, 2 partscompletion: complete merge-base options

Subject: [PATCH 1/2] completion: complete merge-base options

## tl;dr

2 messages between Jan 11, 2014 and Jan 11, 2014. Diffs are folded; open one to read it.

replies: 1people: 1as markdown or json

John Keeping· Jan 11, 2014, 14:27 UTC · lore

Signed-off-by: John Keeping <john@keeping.me.uk>
---
 contrib/completion/git-completion.bash | 6 ++++++
 1 file changed, 6 insertions(+)

Show changes to contrib/completion/git-completion.bash +6 −0

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 4fe5ce3..e74d402 100644
--- 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)"
 }

-- 
1.8.5.226.g0d60d77

John Keeping· Jan 11, 2014, 14:27 UTC · re: John Keeping · lore

[PATCH 2/2] completion: handle --[no-]fork-point options to git-rebase

Signed-off-by: John Keeping <john@keeping.me.uk>
---
 contrib/completion/git-completion.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to contrib/completion/git-completion.bash +1 −1

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index e74d402..3c1a11f 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1637,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

-- 
1.8.5.226.g0d60d77