* [PATCH 1/2] bash completion: Sort config completion variables
@ 2008-12-15 17:45 Lee Marlow
2008-12-15 17:45 ` [PATCH 2/2] bash completion: Sync config variables with its man page Lee Marlow
0 siblings, 1 reply; 2+ messages in thread
From: Lee Marlow @ 2008-12-15 17:45 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: git, Lee Marlow
Sort the config variables to make sync-ing them with
Documents/config.txt easier in the future.
Signed-off-by: Lee Marlow <lee.marlow@gmail.com>
---
contrib/completion/git-completion.bash | 77 ++++++++++++++++---------------
1 files changed, 40 insertions(+), 37 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index c79c98f..79cbed5 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1206,84 +1206,87 @@ _git_config ()
esac
__gitcomp "
apply.whitespace
- core.fileMode
- core.gitProxy
- core.ignoreStat
- core.preferSymlinkRefs
- core.logAllRefUpdates
- core.loosecompression
- core.repositoryFormatVersion
- core.sharedRepository
- core.warnAmbiguousRefs
- core.compression
- core.packedGitWindowSize
- core.packedGitLimit
clean.requireForce
color.branch
color.branch.current
color.branch.local
- color.branch.remote
color.branch.plain
+ color.branch.remote
color.diff
- color.diff.plain
- color.diff.meta
+ color.diff.commit
color.diff.frag
- color.diff.old
+ color.diff.meta
color.diff.new
- color.diff.commit
+ color.diff.old
+ color.diff.plain
color.diff.whitespace
color.pager
color.status
- color.status.header
color.status.added
color.status.changed
+ color.status.header
color.status.untracked
+ core.compression
+ core.fileMode
+ core.gitProxy
+ core.ignoreStat
+ core.logAllRefUpdates
+ core.loosecompression
+ core.packedGitLimit
+ core.packedGitWindowSize
+ core.preferSymlinkRefs
+ core.repositoryFormatVersion
+ core.sharedRepository
+ core.warnAmbiguousRefs
diff.renameLimit
diff.renames
fetch.unpackLimit
format.headers
format.subjectprefix
- gitcvs.enabled
- gitcvs.logfile
- gitcvs.allbinary
- gitcvs.dbname gitcvs.dbdriver gitcvs.dbuser gitcvs.dbpass
- gitcvs.dbtablenameprefix
gc.packrefs
gc.reflogexpire
gc.reflogexpireunreachable
gc.rerereresolved
gc.rerereunresolved
- http.sslVerify
- http.sslCert
- http.sslKey
- http.sslCAInfo
- http.sslCAPath
- http.maxRequests
+ gitcvs.allbinary
+ gitcvs.dbdriver
+ gitcvs.dbname
+ gitcvs.dbpass
+ gitcvs.dbtablenameprefix
+ gitcvs.dbuser
+ gitcvs.enabled
+ gitcvs.logfile
http.lowSpeedLimit
http.lowSpeedTime
+ http.maxRequests
http.noEPSV
+ http.sslCAInfo
+ http.sslCAPath
+ http.sslCert
+ http.sslKey
+ http.sslVerify
i18n.commitEncoding
i18n.logOutputEncoding
log.showroot
- merge.tool
merge.summary
+ merge.tool
merge.verbosity
- pack.window
- pack.depth
- pack.windowMemory
pack.compression
- pack.deltaCacheSize
pack.deltaCacheLimit
+ pack.deltaCacheSize
+ pack.depth
+ pack.window
+ pack.windowMemory
pull.octopus
pull.twohead
+ receive.denyNonFastForwards
+ receive.unpackLimit
repack.useDeltaBaseOffset
showbranch.default
tar.umask
transfer.unpackLimit
- receive.unpackLimit
- receive.denyNonFastForwards
- user.name
user.email
+ user.name
user.signingkey
branch. remote.
"
--
1.6.1.rc2.20.gde0d
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH 2/2] bash completion: Sync config variables with its man page
2008-12-15 17:45 [PATCH 1/2] bash completion: Sort config completion variables Lee Marlow
@ 2008-12-15 17:45 ` Lee Marlow
0 siblings, 0 replies; 2+ messages in thread
From: Lee Marlow @ 2008-12-15 17:45 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: git, Lee Marlow
Add 'normal' to config color options.
Add 'mergeoptions' to branch config options.
Add 'proxy' and 'mirror' to remote config options.
Signed-off-by: Lee Marlow <lee.marlow@gmail.com>
---
contrib/completion/git-completion.bash | 87 +++++++++++++++++++++++++++++---
1 files changed, 80 insertions(+), 7 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 79cbed5..e004549 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1155,7 +1155,7 @@ _git_config ()
;;
color.*.*)
__gitcomp "
- black red green yellow blue magenta cyan white
+ normal black red green yellow blue magenta cyan white
bold dim ul blink reverse
"
return
@@ -1179,7 +1179,7 @@ _git_config ()
branch.*.*)
local pfx="${cur%.*}."
cur="${cur##*.}"
- __gitcomp "remote merge" "$pfx" "$cur"
+ __gitcomp "remote merge mergeoptions" "$pfx" "$cur"
return
;;
branch.*)
@@ -1192,7 +1192,7 @@ _git_config ()
local pfx="${cur%.*}."
cur="${cur##*.}"
__gitcomp "
- url fetch push skipDefaultUpdate
+ url proxy fetch push mirror skipDefaultUpdate
receivepack uploadpack tagopt
" "$pfx" "$cur"
return
@@ -1206,6 +1206,8 @@ _git_config ()
esac
__gitcomp "
apply.whitespace
+ branch.autosetupmerge
+ branch.autosetuprebase
clean.requireForce
color.branch
color.branch.current
@@ -1220,46 +1222,95 @@ _git_config ()
color.diff.old
color.diff.plain
color.diff.whitespace
+ color.interactive
+ color.interactive.header
+ color.interactive.help
+ color.interactive.prompt
color.pager
color.status
color.status.added
color.status.changed
color.status.header
+ color.status.nobranch
color.status.untracked
+ color.status.updated
+ color.ui
+ commit.template
+ core.autocrlf
+ core.bare
core.compression
+ core.deltaBaseCacheLimit
+ core.editor
+ core.excludesfile
core.fileMode
+ core.fsyncobjectfiles
core.gitProxy
+ core.ignoreCygwinFSTricks
core.ignoreStat
core.logAllRefUpdates
core.loosecompression
core.packedGitLimit
core.packedGitWindowSize
+ core.pager
core.preferSymlinkRefs
+ core.preloadindex
+ core.quotepath
core.repositoryFormatVersion
+ core.safecrlf
core.sharedRepository
+ core.symlinks
+ core.trustctime
core.warnAmbiguousRefs
+ core.whitespace
+ core.worktree
+ diff.autorefreshindex
+ diff.external
+ diff.mnemonicprefix
diff.renameLimit
+ diff.renameLimit.
diff.renames
fetch.unpackLimit
format.headers
- format.subjectprefix
+ format.numbered
+ format.pretty
+ format.suffix
+ gc.aggressiveWindow
+ gc.auto
+ gc.autopacklimit
gc.packrefs
+ gc.pruneexpire
gc.reflogexpire
gc.reflogexpireunreachable
gc.rerereresolved
gc.rerereunresolved
gitcvs.allbinary
+ gitcvs.dbTableNamePrefix
gitcvs.dbdriver
gitcvs.dbname
gitcvs.dbpass
- gitcvs.dbtablenameprefix
gitcvs.dbuser
gitcvs.enabled
gitcvs.logfile
+ gitcvs.usecrlfattr
+ gui.blamehistoryctx
+ gui.commitmsgwidth
+ gui.copyblamethreshold
+ gui.diffcontext
+ gui.encoding
+ gui.fastcopyblame
+ gui.matchtrackingbranch
+ gui.newbranchtemplate
+ gui.pruneduringfetch
+ gui.spellingdictionary
+ gui.trustmtime
+ help.autocorrect
+ help.browser
+ help.format
http.lowSpeedLimit
http.lowSpeedTime
http.maxRequests
http.noEPSV
+ http.proxy
http.sslCAInfo
http.sslCAPath
http.sslCert
@@ -1267,27 +1318,49 @@ _git_config ()
http.sslVerify
i18n.commitEncoding
i18n.logOutputEncoding
+ instaweb.browser
+ instaweb.httpd
+ instaweb.local
+ instaweb.modulepath
+ instaweb.port
+ log.date
log.showroot
- merge.summary
+ man.viewer
+ merge.conflictstyle
+ merge.log
+ merge.renameLimit
+ merge.stat
merge.tool
merge.verbosity
+ mergetool.keepBackup
pack.compression
pack.deltaCacheLimit
pack.deltaCacheSize
pack.depth
+ pack.indexVersion
+ pack.packSizeLimit
+ pack.threads
pack.window
pack.windowMemory
pull.octopus
pull.twohead
+ receive.denyCurrentBranch
+ receive.denyDeletes
receive.denyNonFastForwards
+ receive.fsckObjects
receive.unpackLimit
- repack.useDeltaBaseOffset
+ repack.usedeltabaseoffset
+ rerere.autoupdate
+ rerere.enabled
showbranch.default
+ status.relativePaths
+ status.showUntrackedFiles
tar.umask
transfer.unpackLimit
user.email
user.name
user.signingkey
+ web.browser
branch. remote.
"
}
--
1.6.1.rc2.20.gde0d
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-12-15 17:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-12-15 17:45 [PATCH 1/2] bash completion: Sort config completion variables Lee Marlow
2008-12-15 17:45 ` [PATCH 2/2] bash completion: Sync config variables with its man page Lee Marlow
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).