From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Feb 2016 22:16:05 +0000 (-0800)
Subject: Merge branch 'jk/completion-rebase'
X-Git-Tag: v2.8.0-rc0~75
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/103c95dbfb31788e1805eb31a03fbdff76f3be70?ds=inline;hp=-c

Merge branch 'jk/completion-rebase'

* jk/completion-rebase:
completion: add missing git-rebase options
---

103c95dbfb31788e1805eb31a03fbdff76f3be70
diff --combined contrib/completion/git-completion.bash
index a2db20c81f,5cec0ee3cc..800e0bb1af
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -1169,7 -1169,7 +1169,7 @@@ __git_diff_common_options="--stat --num
  			--no-prefix --src-prefix= --dst-prefix=
  			--inter-hunk-context=
  			--patience --histogram --minimal
 -			--raw --word-diff
 +			--raw --word-diff --word-diff-regex=
  			--dirstat --dirstat= --dirstat-by-file
  			--dirstat-by-file= --cumulative
  			--diff-algorithm=
@@@ -1312,7 -1312,6 +1312,7 @@@ _git_grep (
  			--full-name --line-number
  			--extended-regexp --basic-regexp --fixed-strings
  			--perl-regexp
 +			--threads
  			--files-with-matches --name-only
  			--files-without-match
  			--max-depth
@@@ -1688,8 -1687,12 +1688,12 @@@ _git_rebase (
  			--preserve-merges --stat --no-stat
  			--committer-date-is-author-date --ignore-date
  			--ignore-whitespace --whitespace=
- 			--autosquash --fork-point --no-fork-point
- 			--autostash
+ 			--autosquash --no-autosquash
+ 			--fork-point --no-fork-point
+ 			--autostash --no-autostash
+ 			--verify --no-verify
+ 			--keep-empty --root --force-rebase --no-ff
+ 			--exec
  			"
  
  		return
@@@ -1809,7 -1812,7 +1813,7 @@@ _git_config (
  		return
  		;;
  	branch.*.rebase)
 -		__gitcomp "false true"
 +		__gitcomp "false true preserve interactive"
  		return
  		;;
  	remote.pushdefault)