From 194280427d2f2f4ab564aae4c7aa7fa9f7e78f26 Mon Sep 17 00:00:00 2001 From: Rikard Falkeborn Date: Sat, 27 May 2017 08:25:47 +0200 Subject: [PATCH 1/6] completion: add git config gc completions Add missing completion for git config gc options: * gc.aggressiveDepth * gc.autoDetach * gc.logExpiry * gc.worktreePruneExpire Signed-off-by: Rikard Falkeborn Signed-off-by: Junio C Hamano --- contrib/completion/git-completion.bash | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 535a19a70c..94ed7a93b9 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2464,15 +2464,19 @@ _git_config () format.thread format.to gc. + gc.aggressiveDepth gc.aggressiveWindow gc.auto + gc.autoDetach gc.autopacklimit + gc.logExpiry gc.packrefs gc.pruneexpire gc.reflogexpire gc.reflogexpireunreachable gc.rerereresolved gc.rerereunresolved + gc.worktreePruneExpire gitcvs.allbinary gitcvs.commitmsgannotation gitcvs.dbTableNamePrefix From f254eab2e024edec8b8d4a342252efba74901fdb Mon Sep 17 00:00:00 2001 From: Rikard Falkeborn Date: Sat, 27 May 2017 08:25:48 +0200 Subject: [PATCH 2/6] completion: add git config core completions Add missing completions for git config core: * core.checkStat * core.commentChar * core.hideDotFiles * core.hooksPath * core.packedRefsTimeout * core.precomposeUnicode * core.protectHFS * core.protectNTFS * core.splitIndex * core.sshCommand Note that some configs are only used for some platforms (hideDotFiles on Windows and precomposeUnicode on Mac). Signed-off-by: Rikard Falkeborn Signed-off-by: Junio C Hamano --- contrib/completion/git-completion.bash | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 94ed7a93b9..3e6ddaa814 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2403,6 +2403,8 @@ _git_config () core.autocrlf core.bare core.bigFileThreshold + core.checkStat + core.commentChar core.compression core.createObject core.deltaBaseCacheLimit @@ -2412,6 +2414,8 @@ _git_config () core.fileMode core.fsyncobjectfiles core.gitProxy + core.hideDotFiles + core.hooksPath core.ignoreStat core.ignorecase core.logAllRefUpdates @@ -2419,14 +2423,20 @@ _git_config () core.notesRef core.packedGitLimit core.packedGitWindowSize + core.packedRefsTimeout core.pager + core.precomposeUnicode core.preferSymlinkRefs core.preloadindex + core.protectHFS + core.protectNTFS core.quotepath core.repositoryFormatVersion core.safecrlf core.sharedRepository core.sparseCheckout + core.splitIndex + core.sshCommand core.symlinks core.trustctime core.untrackedCache From e8dec567705ebeaaff70bb29bd9f724944c5ae90 Mon Sep 17 00:00:00 2001 From: Rikard Falkeborn Date: Sat, 27 May 2017 08:25:49 +0200 Subject: [PATCH 3/6] completion: add git config am.threeWay completion Signed-off-by: Rikard Falkeborn Signed-off-by: Junio C Hamano --- contrib/completion/git-completion.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 3e6ddaa814..6150790387 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2343,6 +2343,7 @@ _git_config () advice.statusHints alias. am.keepcr + am.threeWay apply.ignorewhitespace apply.whitespace branch.autosetupmerge From fd1552d59d2f181019a8cf18582e89167be51e01 Mon Sep 17 00:00:00 2001 From: Rikard Falkeborn Date: Sat, 27 May 2017 08:25:50 +0200 Subject: [PATCH 4/6] completion: add git config advice completions 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 1184564eac8e. The config still works, but is no longer part of the documentation. Signed-off-by: Rikard Falkeborn Signed-off-by: Junio C Hamano --- contrib/completion/git-completion.bash | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 6150790387..087ea945bd 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2335,12 +2335,20 @@ _git_config () esac __gitcomp " add.ignoreErrors + advice.amWorkDir advice.commitBeforeMerge advice.detachedHead advice.implicitIdentity - advice.pushNonFastForward + advice.pushAlreadyExists + advice.pushFetchFirst + advice.pushNeedsForce + advice.pushNonFFCurrent + advice.pushNonFFMatching + advice.pushUpdateRejected advice.resolveConflict + advice.rmHints advice.statusHints + advice.statusUoption alias. am.keepcr am.threeWay From 6ecef7379ce428ee3da215eaca86b518fce80d68 Mon Sep 17 00:00:00 2001 From: Rikard Falkeborn Date: Sat, 27 May 2017 08:25:51 +0200 Subject: [PATCH 5/6] completion: add git config credential completions Add missing completions for git config credential: * credential.helper * credential.useHttpPath * credential.username Signed-off-by: Rikard Falkeborn Signed-off-by: Junio C Hamano --- contrib/completion/git-completion.bash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 087ea945bd..98617d30cd 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2452,6 +2452,9 @@ _git_config () core.warnAmbiguousRefs core.whitespace core.worktree + credential.helper + credential.useHttpPath + credential.username diff.autorefreshindex diff.external diff.ignoreSubmodules From d78d237bba5f4f65832e8f75a147cb81c59885ce Mon Sep 17 00:00:00 2001 From: Rikard Falkeborn Date: Sat, 27 May 2017 08:25:52 +0200 Subject: [PATCH 6/6] completion: add git config credentialCache.ignoreSIGHUP Signed-off-by: Rikard Falkeborn Signed-off-by: Junio C Hamano --- contrib/completion/git-completion.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 98617d30cd..d18d30b777 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2455,6 +2455,7 @@ _git_config () credential.helper credential.useHttpPath credential.username + credentialCache.ignoreSIGHUP diff.autorefreshindex diff.external diff.ignoreSubmodules