{"thread":{"id":"16740","subject":"[PATCH 2/2] bash completion: Sync config variables with its man page","startedAt":"2008-12-15T17:45:48Z","lastAt":"2008-12-15T17:45:49Z","messageCount":2,"participants":["Lee Marlow"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"97986","messageId":"1229363149-37757-1-git-send-email-lee.marlow@gmail.com","threadId":"16740","inReplyTo":null,"subject":"[PATCH 1/2] bash completion: Sort config completion variables","fromName":"Lee Marlow","fromEmail":"lee.marlow@gmail.com","sentAt":"2008-12-15T17:45:48Z","receivedAt":"2008-12-15T17:45:48Z","isPatch":true,"sender":{"key":"lee.marlow@gmail.com","avatar":"https://gravatar.com/avatar/231170f3c8456cf1af984d30d09f35c5509b5f81494c81fa69dc7a1027473fc0?d=mp&s=160"},"body":"Sort the config variables to make sync-ing them with\nDocuments/config.txt easier in the future.\n\nSigned-off-by: Lee Marlow <lee.marlow@gmail.com>\n---\n contrib/completion/git-completion.bash |   77 ++++++++++++++++---------------\n 1 files changed, 40 insertions(+), 37 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex c79c98f..79cbed5 100755\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1206,84 +1206,87 @@ _git_config ()\n \tesac\n \t__gitcomp \"\n \t\tapply.whitespace\n-\t\tcore.fileMode\n-\t\tcore.gitProxy\n-\t\tcore.ignoreStat\n-\t\tcore.preferSymlinkRefs\n-\t\tcore.logAllRefUpdates\n-\t\tcore.loosecompression\n-\t\tcore.repositoryFormatVersion\n-\t\tcore.sharedRepository\n-\t\tcore.warnAmbiguousRefs\n-\t\tcore.compression\n-\t\tcore.packedGitWindowSize\n-\t\tcore.packedGitLimit\n \t\tclean.requireForce\n \t\tcolor.branch\n \t\tcolor.branch.current\n \t\tcolor.branch.local\n-\t\tcolor.branch.remote\n \t\tcolor.branch.plain\n+\t\tcolor.branch.remote\n \t\tcolor.diff\n-\t\tcolor.diff.plain\n-\t\tcolor.diff.meta\n+\t\tcolor.diff.commit\n \t\tcolor.diff.frag\n-\t\tcolor.diff.old\n+\t\tcolor.diff.meta\n \t\tcolor.diff.new\n-\t\tcolor.diff.commit\n+\t\tcolor.diff.old\n+\t\tcolor.diff.plain\n \t\tcolor.diff.whitespace\n \t\tcolor.pager\n \t\tcolor.status\n-\t\tcolor.status.header\n \t\tcolor.status.added\n \t\tcolor.status.changed\n+\t\tcolor.status.header\n \t\tcolor.status.untracked\n+\t\tcore.compression\n+\t\tcore.fileMode\n+\t\tcore.gitProxy\n+\t\tcore.ignoreStat\n+\t\tcore.logAllRefUpdates\n+\t\tcore.loosecompression\n+\t\tcore.packedGitLimit\n+\t\tcore.packedGitWindowSize\n+\t\tcore.preferSymlinkRefs\n+\t\tcore.repositoryFormatVersion\n+\t\tcore.sharedRepository\n+\t\tcore.warnAmbiguousRefs\n \t\tdiff.renameLimit\n \t\tdiff.renames\n \t\tfetch.unpackLimit\n \t\tformat.headers\n \t\tformat.subjectprefix\n-\t\tgitcvs.enabled\n-\t\tgitcvs.logfile\n-\t\tgitcvs.allbinary\n-\t\tgitcvs.dbname gitcvs.dbdriver gitcvs.dbuser gitcvs.dbpass\n-\t\tgitcvs.dbtablenameprefix\n \t\tgc.packrefs\n \t\tgc.reflogexpire\n \t\tgc.reflogexpireunreachable\n \t\tgc.rerereresolved\n \t\tgc.rerereunresolved\n-\t\thttp.sslVerify\n-\t\thttp.sslCert\n-\t\thttp.sslKey\n-\t\thttp.sslCAInfo\n-\t\thttp.sslCAPath\n-\t\thttp.maxRequests\n+\t\tgitcvs.allbinary\n+\t\tgitcvs.dbdriver\n+\t\tgitcvs.dbname\n+\t\tgitcvs.dbpass\n+\t\tgitcvs.dbtablenameprefix\n+\t\tgitcvs.dbuser\n+\t\tgitcvs.enabled\n+\t\tgitcvs.logfile\n \t\thttp.lowSpeedLimit\n \t\thttp.lowSpeedTime\n+\t\thttp.maxRequests\n \t\thttp.noEPSV\n+\t\thttp.sslCAInfo\n+\t\thttp.sslCAPath\n+\t\thttp.sslCert\n+\t\thttp.sslKey\n+\t\thttp.sslVerify\n \t\ti18n.commitEncoding\n \t\ti18n.logOutputEncoding\n \t\tlog.showroot\n-\t\tmerge.tool\n \t\tmerge.summary\n+\t\tmerge.tool\n \t\tmerge.verbosity\n-\t\tpack.window\n-\t\tpack.depth\n-\t\tpack.windowMemory\n \t\tpack.compression\n-\t\tpack.deltaCacheSize\n \t\tpack.deltaCacheLimit\n+\t\tpack.deltaCacheSize\n+\t\tpack.depth\n+\t\tpack.window\n+\t\tpack.windowMemory\n \t\tpull.octopus\n \t\tpull.twohead\n+\t\treceive.denyNonFastForwards\n+\t\treceive.unpackLimit\n \t\trepack.useDeltaBaseOffset\n \t\tshowbranch.default\n \t\ttar.umask\n \t\ttransfer.unpackLimit\n-\t\treceive.unpackLimit\n-\t\treceive.denyNonFastForwards\n-\t\tuser.name\n \t\tuser.email\n+\t\tuser.name\n \t\tuser.signingkey\n \t\tbranch. remote.\n \t\"\n-- \n1.6.1.rc2.20.gde0d\n"},{"id":"97985","messageId":"1229363149-37757-2-git-send-email-lee.marlow@gmail.com","threadId":"16740","inReplyTo":"1229363149-37757-1-git-send-email-lee.marlow@gmail.com","subject":"[PATCH 2/2] bash completion: Sync config variables with its man page","fromName":"Lee Marlow","fromEmail":"lee.marlow@gmail.com","sentAt":"2008-12-15T17:45:49Z","receivedAt":"2008-12-15T17:45:49Z","isPatch":true,"sender":{"key":"lee.marlow@gmail.com","avatar":"https://gravatar.com/avatar/231170f3c8456cf1af984d30d09f35c5509b5f81494c81fa69dc7a1027473fc0?d=mp&s=160"},"body":"Add 'normal' to config color options.\nAdd 'mergeoptions' to branch config options.\nAdd 'proxy' and 'mirror' to remote config options.\n\nSigned-off-by: Lee Marlow <lee.marlow@gmail.com>\n---\n contrib/completion/git-completion.bash |   87 +++++++++++++++++++++++++++++---\n 1 files changed, 80 insertions(+), 7 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 79cbed5..e004549 100755\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1155,7 +1155,7 @@ _git_config ()\n \t\t;;\n \tcolor.*.*)\n \t\t__gitcomp \"\n-\t\t\tblack red green yellow blue magenta cyan white\n+\t\t\tnormal black red green yellow blue magenta cyan white\n \t\t\tbold dim ul blink reverse\n \t\t\t\"\n \t\treturn\n@@ -1179,7 +1179,7 @@ _git_config ()\n \tbranch.*.*)\n \t\tlocal pfx=\"${cur%.*}.\"\n \t\tcur=\"${cur##*.}\"\n-\t\t__gitcomp \"remote merge\" \"$pfx\" \"$cur\"\n+\t\t__gitcomp \"remote merge mergeoptions\" \"$pfx\" \"$cur\"\n \t\treturn\n \t\t;;\n \tbranch.*)\n@@ -1192,7 +1192,7 @@ _git_config ()\n \t\tlocal pfx=\"${cur%.*}.\"\n \t\tcur=\"${cur##*.}\"\n \t\t__gitcomp \"\n-\t\t\turl fetch push skipDefaultUpdate\n+\t\t\turl proxy fetch push mirror skipDefaultUpdate\n \t\t\treceivepack uploadpack tagopt\n \t\t\t\" \"$pfx\" \"$cur\"\n \t\treturn\n@@ -1206,6 +1206,8 @@ _git_config ()\n \tesac\n \t__gitcomp \"\n \t\tapply.whitespace\n+\t\tbranch.autosetupmerge\n+\t\tbranch.autosetuprebase\n \t\tclean.requireForce\n \t\tcolor.branch\n \t\tcolor.branch.current\n@@ -1220,46 +1222,95 @@ _git_config ()\n \t\tcolor.diff.old\n \t\tcolor.diff.plain\n \t\tcolor.diff.whitespace\n+\t\tcolor.interactive\n+\t\tcolor.interactive.header\n+\t\tcolor.interactive.help\n+\t\tcolor.interactive.prompt\n \t\tcolor.pager\n \t\tcolor.status\n \t\tcolor.status.added\n \t\tcolor.status.changed\n \t\tcolor.status.header\n+\t\tcolor.status.nobranch\n \t\tcolor.status.untracked\n+\t\tcolor.status.updated\n+\t\tcolor.ui\n+\t\tcommit.template\n+\t\tcore.autocrlf\n+\t\tcore.bare\n \t\tcore.compression\n+\t\tcore.deltaBaseCacheLimit\n+\t\tcore.editor\n+\t\tcore.excludesfile\n \t\tcore.fileMode\n+\t\tcore.fsyncobjectfiles\n \t\tcore.gitProxy\n+\t\tcore.ignoreCygwinFSTricks\n \t\tcore.ignoreStat\n \t\tcore.logAllRefUpdates\n \t\tcore.loosecompression\n \t\tcore.packedGitLimit\n \t\tcore.packedGitWindowSize\n+\t\tcore.pager\n \t\tcore.preferSymlinkRefs\n+\t\tcore.preloadindex\n+\t\tcore.quotepath\n \t\tcore.repositoryFormatVersion\n+\t\tcore.safecrlf\n \t\tcore.sharedRepository\n+\t\tcore.symlinks\n+\t\tcore.trustctime\n \t\tcore.warnAmbiguousRefs\n+\t\tcore.whitespace\n+\t\tcore.worktree\n+\t\tdiff.autorefreshindex\n+\t\tdiff.external\n+\t\tdiff.mnemonicprefix\n \t\tdiff.renameLimit\n+\t\tdiff.renameLimit.\n \t\tdiff.renames\n \t\tfetch.unpackLimit\n \t\tformat.headers\n-\t\tformat.subjectprefix\n+\t\tformat.numbered\n+\t\tformat.pretty\n+\t\tformat.suffix\n+\t\tgc.aggressiveWindow\n+\t\tgc.auto\n+\t\tgc.autopacklimit\n \t\tgc.packrefs\n+\t\tgc.pruneexpire\n \t\tgc.reflogexpire\n \t\tgc.reflogexpireunreachable\n \t\tgc.rerereresolved\n \t\tgc.rerereunresolved\n \t\tgitcvs.allbinary\n+\t\tgitcvs.dbTableNamePrefix\n \t\tgitcvs.dbdriver\n \t\tgitcvs.dbname\n \t\tgitcvs.dbpass\n-\t\tgitcvs.dbtablenameprefix\n \t\tgitcvs.dbuser\n \t\tgitcvs.enabled\n \t\tgitcvs.logfile\n+\t\tgitcvs.usecrlfattr\n+\t\tgui.blamehistoryctx\n+\t\tgui.commitmsgwidth\n+\t\tgui.copyblamethreshold\n+\t\tgui.diffcontext\n+\t\tgui.encoding\n+\t\tgui.fastcopyblame\n+\t\tgui.matchtrackingbranch\n+\t\tgui.newbranchtemplate\n+\t\tgui.pruneduringfetch\n+\t\tgui.spellingdictionary\n+\t\tgui.trustmtime\n+\t\thelp.autocorrect\n+\t\thelp.browser\n+\t\thelp.format\n \t\thttp.lowSpeedLimit\n \t\thttp.lowSpeedTime\n \t\thttp.maxRequests\n \t\thttp.noEPSV\n+\t\thttp.proxy\n \t\thttp.sslCAInfo\n \t\thttp.sslCAPath\n \t\thttp.sslCert\n@@ -1267,27 +1318,49 @@ _git_config ()\n \t\thttp.sslVerify\n \t\ti18n.commitEncoding\n \t\ti18n.logOutputEncoding\n+\t\tinstaweb.browser\n+\t\tinstaweb.httpd\n+\t\tinstaweb.local\n+\t\tinstaweb.modulepath\n+\t\tinstaweb.port\n+\t\tlog.date\n \t\tlog.showroot\n-\t\tmerge.summary\n+\t\tman.viewer\n+\t\tmerge.conflictstyle\n+\t\tmerge.log\n+\t\tmerge.renameLimit\n+\t\tmerge.stat\n \t\tmerge.tool\n \t\tmerge.verbosity\n+\t\tmergetool.keepBackup\n \t\tpack.compression\n \t\tpack.deltaCacheLimit\n \t\tpack.deltaCacheSize\n \t\tpack.depth\n+\t\tpack.indexVersion\n+\t\tpack.packSizeLimit\n+\t\tpack.threads\n \t\tpack.window\n \t\tpack.windowMemory\n \t\tpull.octopus\n \t\tpull.twohead\n+\t\treceive.denyCurrentBranch\n+\t\treceive.denyDeletes\n \t\treceive.denyNonFastForwards\n+\t\treceive.fsckObjects\n \t\treceive.unpackLimit\n-\t\trepack.useDeltaBaseOffset\n+\t\trepack.usedeltabaseoffset\n+\t\trerere.autoupdate\n+\t\trerere.enabled\n \t\tshowbranch.default\n+\t\tstatus.relativePaths\n+\t\tstatus.showUntrackedFiles\n \t\ttar.umask\n \t\ttransfer.unpackLimit\n \t\tuser.email\n \t\tuser.name\n \t\tuser.signingkey\n+\t\tweb.browser\n \t\tbranch. remote.\n \t\"\n }\n-- \n1.6.1.rc2.20.gde0d\n"}]}