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

completion: add git config advice completions

Browse Source 
Add missing completions for git config advice:

* advice.amWorkDir
* advice.pushAlreadyExists
* advice.pushFetchFirst
* advice.pushNeedsForce
* advice.pushNonFFCurrent
* advice.pushNonFFMatching
* advice.pushUpdateRejected
* advice.rmHints
* advice.statusUoption

Remove completion for git config advice.pushNonFastForward,
since it was renamed to pushUpdateRejected in 1184564eac.
The config still works, but is no longer part of the documentation.

Signed-off-by: Rikard Falkeborn <rikard.falkeborn@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Rikard Falkeborn 2017-05-27 08:25:50 +02:00 committed by Junio C Hamano
parent e8dec56770
commit fd1552d59d
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2335,12 +2335,20 @@ _git_config ()
esac esac
__gitcomp " __gitcomp "
add.ignoreErrors add.ignoreErrors
advice.amWorkDir
advice.commitBeforeMerge advice.commitBeforeMerge
advice.detachedHead advice.detachedHead
advice.implicitIdentity advice.implicitIdentity
advice.pushNonFastForward advice.pushAlreadyExists
advice.pushFetchFirst
advice.pushNeedsForce
advice.pushNonFFCurrent
advice.pushNonFFMatching
advice.pushUpdateRejected
advice.resolveConflict advice.resolveConflict
advice.rmHints
advice.statusHints advice.statusHints
advice.statusUoption
alias. alias.
am.keepcr am.keepcr
am.threeWay am.threeWay