* [PATCH 1/2] completion: complete merge-base options
@ 2014-01-11 14:27 John Keeping
2014-01-11 14:27 ` [PATCH 2/2] completion: handle --[no-]fork-point options to git-rebase John Keeping
0 siblings, 1 reply; 2+ messages in thread
From: John Keeping @ 2014-01-11 14:27 UTC (permalink / raw)
To: git; +Cc: John Keeping
Signed-off-by: John Keeping <john@keeping.me.uk>
---
contrib/completion/git-completion.bash | 6 ++++++
1 file changed, 6 insertions(+)
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH 2/2] completion: handle --[no-]fork-point options to git-rebase
2014-01-11 14:27 [PATCH 1/2] completion: complete merge-base options John Keeping
@ 2014-01-11 14:27 ` John Keeping
0 siblings, 0 replies; 2+ messages in thread
From: John Keeping @ 2014-01-11 14:27 UTC (permalink / raw)
To: git; +Cc: John Keeping
Signed-off-by: John Keeping <john@keeping.me.uk>
---
contrib/completion/git-completion.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-01-11 14:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-11 14:27 [PATCH 1/2] completion: complete merge-base options John Keeping
2014-01-11 14:27 ` [PATCH 2/2] completion: handle --[no-]fork-point options to git-rebase John Keeping
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).