undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tm/completion-commit-fixup-squash'

Browse Source 
* tm/completion-commit-fixup-squash:
  completion: commit --fixup and --squash
  completion: unite --reuse-message and --reedit-message handling
This commit is contained in:
Junio C Hamano 2011-10-17 21:37:10 -07:00
commit c795df7c0a
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
contrib/completion/git-completion.bash
View File

@ -1259,12 +1259,9 @@ _git_commit ()
" "" "${cur##--cleanup=}"
return
;;
--reuse-message=*)
__gitcomp "$(__git_refs)" "" "${cur##--reuse-message=}"
return
;;
--reedit-message=*)
__gitcomp "$(__git_refs)" "" "${cur##--reedit-message=}"
--reuse-message=*|--reedit-message=*|\
--fixup=*|--squash=*)
__gitcomp "$(__git_refs)" "" "${cur#*=}"
return
;;
--untracked-files=*)
@ -1278,7 +1275,7 @@ _git_commit ()
--dry-run --reuse-message= --reedit-message=
--reset-author --file= --message= --template=
--cleanup= --untracked-files --untracked-files=
--verbose --quiet
--verbose --quiet --fixup= --squash=
"
return
esac