development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 18:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jk/complete-merge-base'

Browse source 
* jk/complete-merge-base:
  completion: handle --[no-]fork-point options to git-rebase
  completion: complete merge-base options
This commit is contained in:
Junio C Hamano 2014-01-27 10:43:55 -08:00
parent c9e8c1aa3f 4310e328d4
commit ba98a2f660
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
contrib/completion/git-completion.bash
View file

@ -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