completion: add {gui,diff,merge}tool, man, and pager config variables
Signed-off-by: Stephen Boyd <bebarino@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stephen Boyd committed
May 3, 2009 at 23:25 UTC
0aa62fd0414b0e8a6271d1d0dd80e5f640633473
1 file changed
+45
contrib/completion/git-completion.bash
+45
@@ -1376,6 +1376,39 @@ _git_config ()
1376
__gitcomp "$(__git_heads)" "$pfx" "$cur" "."
1377
return
1378
;;
1379
+ guitool.*.*)
1380
+ local pfx="${cur%.*}."
1381
+ cur="${cur##*.}"
1382
+ __gitcomp "
1383
+ argprompt cmd confirm needsfile noconsole norescan
1384
+ prompt revprompt revunmerged title
1385
+ " "$pfx" "$cur"
1386
+ return
1387
+ ;;
1388
+ difftool.*.*)
1389
+ local pfx="${cur%.*}."
1390
+ cur="${cur##*.}"
1391
+ __gitcomp "cmd path" "$pfx" "$cur"
1392
+ return
1393
+ ;;
1394
+ man.*.*)
1395
+ local pfx="${cur%.*}."
1396
+ cur="${cur##*.}"
1397
+ __gitcomp "cmd path" "$pfx" "$cur"
1398
+ return
1399
+ ;;
1400
+ mergetool.*.*)
1401
+ local pfx="${cur%.*}."
1402
+ cur="${cur##*.}"
1403
+ __gitcomp "cmd path trustExitCode" "$pfx" "$cur"
1404
+ return
1405
+ ;;
1406
+ pager.*)
1407
+ local pfx="${cur%.*}."
1408
+ cur="${cur#*.}"
1409
+ __gitcomp "$(__git_all_commands)" "$pfx" "$cur"
1410
+ return
1411
+ ;;
1412
remote.*.*)
1413
local pfx="${cur%.*}."
1414
cur="${cur##*.}"
@@ -1391,6 +1424,12 @@ _git_config ()
1424
__gitcomp "$(__git_remotes)" "$pfx" "$cur" "."
1425
return
1426
;;
1427
+ url.*.*)
1428
+ local pfx="${cur%.*}."
1429
+ cur="${cur##*.}"
1430
+ __gitcomp "insteadof" "$pfx" "$cur"
1431
+ return
1432
+ ;;
1433
esac
1434
__gitcomp "
1435
alias.
@@ -1465,6 +1504,7 @@ _git_config ()
1504
diff.suppressBlankEmpty
1505
diff.tool
1506
diff.wordRegex
1507
+ difftool.
1508
difftool.prompt
1509
fetch.unpackLimit
1510
format.attach
@@ -1495,6 +1535,7 @@ _git_config ()
1535
gitcvs.enabled
1536
gitcvs.logfile
1537
gitcvs.usecrlfattr
1538
+ guitool.
1539
gui.blamehistoryctx
1540
gui.commitmsgwidth
1541
gui.copyblamethreshold
@@ -1538,6 +1579,7 @@ _git_config ()
1579
log.date
1580
log.showroot
1581
mailmap.file
1582
+ man.
1583
man.viewer
1584
merge.conflictstyle
1585
merge.log
@@ -1545,6 +1587,7 @@ _git_config ()
1587
merge.stat
1588
merge.tool
1589
merge.verbosity
1590
+ mergetool.
1591
mergetool.keepBackup
1592
mergetool.prompt
1593
pack.compression
@@ -1556,6 +1599,7 @@ _git_config ()
1599
pack.threads
1600
pack.window
1601
pack.windowMemory
1602
+ pager.
1603
pull.octopus
1604
pull.twohead
1605
push.default
@@ -1593,6 +1637,7 @@ _git_config ()
1637
status.showUntrackedFiles
1638
tar.umask
1639
transfer.unpackLimit
1640
+ url.
1641
user.email
1642
user.name
1643
user.signingkey