bash completion: Sync config variables with their man pages
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Lee Marlow committed
Dec 15, 2008 at 10:45 UTC
98171a07ae74e796a6c78e7c446ac9a5aaf28c07
1 file changed
+80
-7
contrib/completion/git-completion.bash
+80
-7
@@ -1155,7 +1155,7 @@ _git_config ()
1155
;;
1156
color.*.*)
1157
__gitcomp "
1158
- black red green yellow blue magenta cyan white
1158
+ normal black red green yellow blue magenta cyan white
1159
bold dim ul blink reverse
1160
"
1161
return
@@ -1179,7 +1179,7 @@ _git_config ()
1179
branch.*.*)
1180
local pfx="${cur%.*}."
1181
cur="${cur##*.}"
1182
- __gitcomp "remote merge" "$pfx" "$cur"
1182
+ __gitcomp "remote merge mergeoptions" "$pfx" "$cur"
1183
return
1184
;;
1185
branch.*)
@@ -1192,7 +1192,7 @@ _git_config ()
1192
local pfx="${cur%.*}."
1193
cur="${cur##*.}"
1194
__gitcomp "
1195
- url fetch push skipDefaultUpdate
1195
+ url proxy fetch push mirror skipDefaultUpdate
1196
receivepack uploadpack tagopt
1197
" "$pfx" "$cur"
1198
return
@@ -1206,6 +1206,8 @@ _git_config ()
1206
esac
1207
__gitcomp "
1208
apply.whitespace
1209
+ branch.autosetupmerge
1210
+ branch.autosetuprebase
1211
clean.requireForce
1212
color.branch
1213
color.branch.current
@@ -1220,46 +1222,95 @@ _git_config ()
1222
color.diff.old
1223
color.diff.plain
1224
color.diff.whitespace
1225
+ color.interactive
1226
+ color.interactive.header
1227
+ color.interactive.help
1228
+ color.interactive.prompt
1229
color.pager
1230
color.status
1231
color.status.added
1232
color.status.changed
1233
color.status.header
1234
+ color.status.nobranch
1235
color.status.untracked
1236
+ color.status.updated
1237
+ color.ui
1238
+ commit.template
1239
+ core.autocrlf
1240
+ core.bare
1241
core.compression
1242
+ core.deltaBaseCacheLimit
1243
+ core.editor
1244
+ core.excludesfile
1245
core.fileMode
1246
+ core.fsyncobjectfiles
1247
core.gitProxy
1248
+ core.ignoreCygwinFSTricks
1249
core.ignoreStat
1250
core.logAllRefUpdates
1251
core.loosecompression
1252
core.packedGitLimit
1253
core.packedGitWindowSize
1254
+ core.pager
1255
core.preferSymlinkRefs
1256
+ core.preloadindex
1257
+ core.quotepath
1258
core.repositoryFormatVersion
1259
+ core.safecrlf
1260
core.sharedRepository
1261
+ core.symlinks
1262
+ core.trustctime
1263
core.warnAmbiguousRefs
1264
+ core.whitespace
1265
+ core.worktree
1266
+ diff.autorefreshindex
1267
+ diff.external
1268
+ diff.mnemonicprefix
1269
diff.renameLimit
1270
+ diff.renameLimit.
1271
diff.renames
1272
fetch.unpackLimit
1273
format.headers
1245
- format.subjectprefix
1274
+ format.numbered
1275
+ format.pretty
1276
+ format.suffix
1277
+ gc.aggressiveWindow
1278
+ gc.auto
1279
+ gc.autopacklimit
1280
gc.packrefs
1281
+ gc.pruneexpire
1282
gc.reflogexpire
1283
gc.reflogexpireunreachable
1284
gc.rerereresolved
1285
gc.rerereunresolved
1286
gitcvs.allbinary
1287
+ gitcvs.dbTableNamePrefix
1288
gitcvs.dbdriver
1289
gitcvs.dbname
1290
gitcvs.dbpass
1255
- gitcvs.dbtablenameprefix
1291
gitcvs.dbuser
1292
gitcvs.enabled
1293
gitcvs.logfile
1294
+ gitcvs.usecrlfattr
1295
+ gui.blamehistoryctx
1296
+ gui.commitmsgwidth
1297
+ gui.copyblamethreshold
1298
+ gui.diffcontext
1299
+ gui.encoding
1300
+ gui.fastcopyblame
1301
+ gui.matchtrackingbranch
1302
+ gui.newbranchtemplate
1303
+ gui.pruneduringfetch
1304
+ gui.spellingdictionary
1305
+ gui.trustmtime
1306
+ help.autocorrect
1307
+ help.browser
1308
+ help.format
1309
http.lowSpeedLimit
1310
http.lowSpeedTime
1311
http.maxRequests
1312
http.noEPSV
1313
+ http.proxy
1314
http.sslCAInfo
1315
http.sslCAPath
1316
http.sslCert
@@ -1267,27 +1318,49 @@ _git_config ()
1318
http.sslVerify
1319
i18n.commitEncoding
1320
i18n.logOutputEncoding
1321
+ instaweb.browser
1322
+ instaweb.httpd
1323
+ instaweb.local
1324
+ instaweb.modulepath
1325
+ instaweb.port
1326
+ log.date
1327
log.showroot
1271
- merge.summary
1328
+ man.viewer
1329
+ merge.conflictstyle
1330
+ merge.log
1331
+ merge.renameLimit
1332
+ merge.stat
1333
merge.tool
1334
merge.verbosity
1335
+ mergetool.keepBackup
1336
pack.compression
1337
pack.deltaCacheLimit
1338
pack.deltaCacheSize
1339
pack.depth
1340
+ pack.indexVersion
1341
+ pack.packSizeLimit
1342
+ pack.threads
1343
pack.window
1344
pack.windowMemory
1345
pull.octopus
1346
pull.twohead
1347
+ receive.denyCurrentBranch
1348
+ receive.denyDeletes
1349
receive.denyNonFastForwards
1350
+ receive.fsckObjects
1351
receive.unpackLimit
1284
- repack.useDeltaBaseOffset
1352
+ repack.usedeltabaseoffset
1353
+ rerere.autoupdate
1354
+ rerere.enabled
1355
showbranch.default
1356
+ status.relativePaths
1357
+ status.showUntrackedFiles
1358
tar.umask
1359
transfer.unpackLimit
1360
user.email
1361
user.name
1362
user.signingkey
1363
+ web.browser
1364
branch. remote.
1365
"
1366
}