@@ -64,7 +64,7 @@ The values following the equals sign in variable assign are all either
64
64
a string, an integer, or a boolean. Boolean values may be given as yes/no,
65
65
0/1, true/false or on/off. Case is not significant in boolean values, when
66
66
converting value to the canonical form using '--bool' type specifier;
67
- 'git- config' will ensure that the output is "true" or "false".
67
+ 'git config' will ensure that the output is "true" or "false".
68
68
69
69
String values may be entirely or partially enclosed in double quotes.
70
70
You need to enclose variable values in double quotes if you want to
@@ -442,8 +442,8 @@ core.pager::
442
442
443
443
core.whitespace::
444
444
A comma separated list of common whitespace problems to
445
- notice. 'git- diff' will use `color.diff.whitespace` to
446
- highlight them, and 'git- apply --whitespace=error' will
445
+ notice. 'git diff' will use `color.diff.whitespace` to
446
+ highlight them, and 'git apply --whitespace=error' will
447
447
consider them as errors. You can prefix `-` to disable
448
448
any of them (e.g. `-trailing-space`):
449
449
+
@@ -503,7 +503,7 @@ This setting defaults to "refs/notes/commits", and can be overridden by
503
503
the `GIT_NOTES_REF` environment variable.
504
504
505
505
add.ignore-errors::
506
- Tells 'git- add' to continue adding files when some files cannot be
506
+ Tells 'git add' to continue adding files when some files cannot be
507
507
added due to indexing errors. Equivalent to the '--ignore-errors'
508
508
option of linkgit:git-add[1].
509
509
@@ -525,19 +525,19 @@ executed from the top-level directory of a repository, which may
525
525
not necessarily be the current directory.
526
526
527
527
apply.ignorewhitespace::
528
- When set to 'change', tells 'git- apply' to ignore changes in
528
+ When set to 'change', tells 'git apply' to ignore changes in
529
529
whitespace, in the same way as the '--ignore-space-change'
530
530
option.
531
- When set to one of: no, none, never, false tells 'git- apply' to
531
+ When set to one of: no, none, never, false tells 'git apply' to
532
532
respect all whitespace differences.
533
533
See linkgit:git-apply[1].
534
534
535
535
apply.whitespace::
536
- Tells 'git- apply' how to handle whitespaces, in the same way
536
+ Tells 'git apply' how to handle whitespaces, in the same way
537
537
as the '--whitespace' option. See linkgit:git-apply[1].
538
538
539
539
branch.autosetupmerge::
540
- Tells 'git- branch' and 'git- checkout' to setup new branches
540
+ Tells 'git branch' and 'git checkout' to setup new branches
541
541
so that linkgit:git-pull[1] will appropriately merge from the
542
542
starting point branch. Note that even if this option is not set,
543
543
this behavior can be chosen per-branch using the `--track`
@@ -548,7 +548,7 @@ branch.autosetupmerge::
548
548
branch. This option defaults to true.
549
549
550
550
branch.autosetuprebase::
551
- When a new branch is created with 'git- branch' or 'git- checkout'
551
+ When a new branch is created with 'git branch' or 'git checkout'
552
552
that tracks another branch, this variable tells git to set
553
553
up pull to rebase instead of merge (see "branch.<name>.rebase").
554
554
When `never`, rebase is never automatically set to true.
@@ -563,24 +563,24 @@ branch.autosetuprebase::
563
563
This option defaults to never.
564
564
565
565
branch.<name>.remote::
566
- When in branch <name>, it tells 'git- fetch' and 'git- push' which
566
+ When in branch <name>, it tells 'git fetch' and 'git push' which
567
567
remote to fetch from/push to. It defaults to `origin` if no remote is
568
568
configured. `origin` is also used if you are not on any branch.
569
569
570
570
branch.<name>.merge::
571
571
Defines, together with branch.<name>.remote, the upstream branch
572
- for the given branch. It tells 'git- fetch'/'git- pull' which
573
- branch to merge and can also affect 'git- push' (see push.default).
574
- When in branch <name>, it tells 'git- fetch' the default
572
+ for the given branch. It tells 'git fetch'/'git pull' which
573
+ branch to merge and can also affect 'git push' (see push.default).
574
+ When in branch <name>, it tells 'git fetch' the default
575
575
refspec to be marked for merging in FETCH_HEAD. The value is
576
576
handled like the remote part of a refspec, and must match a
577
577
ref which is fetched from the remote given by
578
578
"branch.<name>.remote".
579
- The merge information is used by 'git- pull' (which at first calls
580
- 'git- fetch') to lookup the default branch for merging. Without
581
- this option, 'git- pull' defaults to merge the first refspec fetched.
579
+ The merge information is used by 'git pull' (which at first calls
580
+ 'git fetch') to lookup the default branch for merging. Without
581
+ this option, 'git pull' defaults to merge the first refspec fetched.
582
582
Specify multiple values to get an octopus merge.
583
- If you wish to setup 'git- pull' so that it merges into <name> from
583
+ If you wish to setup 'git pull' so that it merges into <name> from
584
584
another branch in the local repository, you can point
585
585
branch.<name>.merge to the desired branch, and use the special setting
586
586
`.` (a period) for branch.<name>.remote.
@@ -673,7 +673,7 @@ color.interactive::
673
673
colors only when the output is to the terminal. Defaults to false.
674
674
675
675
color.interactive.<slot>::
676
- Use customized color for 'git- add --interactive'
676
+ Use customized color for 'git add --interactive'
677
677
output. `<slot>` may be `prompt`, `header`, `help` or `error`, for
678
678
four distinct types of normal output from interactive
679
679
commands. The values of these variables may be specified as
@@ -718,14 +718,14 @@ commit.template::
718
718
specified user's home directory.
719
719
720
720
diff.autorefreshindex::
721
- When using 'git- diff' to compare with work tree
721
+ When using 'git diff' to compare with work tree
722
722
files, do not consider stat-only change as changed.
723
723
Instead, silently run `git update-index --refresh` to
724
724
update the cached stat information for paths whose
725
725
contents in the work tree match the contents in the
726
726
index. This option defaults to true. Note that this
727
- affects only 'git- diff' Porcelain, and not lower level
728
- 'diff' commands, such as 'git- diff-files'.
727
+ affects only 'git diff' Porcelain, and not lower level
728
+ 'diff' commands, such as 'git diff-files'.
729
729
730
730
diff.external::
731
731
If this config variable is set, diff generation is not
@@ -737,7 +737,7 @@ diff.external::
737
737
your files, you might want to use linkgit:gitattributes[5] instead.
738
738
739
739
diff.mnemonicprefix::
740
- If set, 'git- diff' uses a prefix pair that is different from the
740
+ If set, 'git diff' uses a prefix pair that is different from the
741
741
standard "a/" and "b/" depending on what is being compared. When
742
742
this configuration is in effect, reverse diff output also swaps
743
743
the order of the prefixes:
@@ -754,7 +754,7 @@ diff.mnemonicprefix::
754
754
755
755
diff.renameLimit::
756
756
The number of files to consider when performing the copy/rename
757
- detection; equivalent to the 'git- diff' option '-l'.
757
+ detection; equivalent to the 'git diff' option '-l'.
758
758
759
759
diff.renames::
760
760
Tells git to detect renames. If set to any boolean value, it
@@ -840,7 +840,7 @@ format.pretty::
840
840
linkgit:git-whatchanged[1].
841
841
842
842
format.thread::
843
- The default threading style for 'git- format-patch'. Can be
843
+ The default threading style for 'git format-patch'. Can be
844
844
either a boolean value, `shallow` or `deep`. `shallow`
845
845
threading makes every mail a reply to the head of the series,
846
846
where the head is chosen from the cover letter, the
@@ -858,7 +858,7 @@ format.signoff::
858
858
859
859
gc.aggressiveWindow::
860
860
The window size parameter used in the delta compression
861
- algorithm used by 'git- gc --aggressive'. This defaults
861
+ algorithm used by 'git gc --aggressive'. This defaults
862
862
to 10.
863
863
864
864
gc.auto::
@@ -875,39 +875,39 @@ gc.autopacklimit::
875
875
default value is 50. Setting this to 0 disables it.
876
876
877
877
gc.packrefs::
878
- 'git- gc' does not run `git pack-refs` in a bare repository by
878
+ 'git gc' does not run `git pack-refs` in a bare repository by
879
879
default so that older dumb-transport clients can still fetch
880
- from the repository. Setting this to `true` lets 'git- gc'
880
+ from the repository. Setting this to `true` lets 'git gc'
881
881
to run `git pack-refs`. Setting this to `false` tells
882
- 'git- gc' never to run `git pack-refs`. The default setting is
882
+ 'git gc' never to run `git pack-refs`. The default setting is
883
883
`notbare`. Enable it only when you know you do not have to
884
884
support such clients. The default setting will change to `true`
885
885
at some stage, and setting this to `false` will continue to
886
- prevent `git pack-refs` from being run from 'git- gc'.
886
+ prevent `git pack-refs` from being run from 'git gc'.
887
887
888
888
gc.pruneexpire::
889
- When 'git- gc' is run, it will call 'prune --expire 2.weeks.ago'.
889
+ When 'git gc' is run, it will call 'prune --expire 2.weeks.ago'.
890
890
Override the grace period with this config variable. The value
891
891
"now" may be used to disable this grace period and always prune
892
892
unreachable objects immediately.
893
893
894
894
gc.reflogexpire::
895
- 'git- reflog expire' removes reflog entries older than
895
+ 'git reflog expire' removes reflog entries older than
896
896
this time; defaults to 90 days.
897
897
898
898
gc.reflogexpireunreachable::
899
- 'git- reflog expire' removes reflog entries older than
899
+ 'git reflog expire' removes reflog entries older than
900
900
this time and are not reachable from the current tip;
901
901
defaults to 30 days.
902
902
903
903
gc.rerereresolved::
904
904
Records of conflicted merge you resolved earlier are
905
- kept for this many days when 'git- rerere gc' is run.
905
+ kept for this many days when 'git rerere gc' is run.
906
906
The default is 60 days. See linkgit:git-rerere[1].
907
907
908
908
gc.rerereunresolved::
909
909
Records of conflicted merge you have not resolved are
910
- kept for this many days when 'git- rerere gc' is run.
910
+ kept for this many days when 'git rerere gc' is run.
911
911
The default is 15 days. See linkgit:git-rerere[1].
912
912
913
913
gitcvs.commitmsgannotation::
@@ -1168,7 +1168,7 @@ i18n.commitEncoding::
1168
1168
1169
1169
i18n.logOutputEncoding::
1170
1170
Character encoding the commit messages are converted to when
1171
- running 'git- log' and friends.
1171
+ running 'git log' and friends.
1172
1172
1173
1173
imap::
1174
1174
The configuration variables in the 'imap' section are described
@@ -1202,7 +1202,7 @@ interactive.singlekey::
1202
1202
1203
1203
log.date::
1204
1204
Set default date-time mode for the log command. Setting log.date
1205
- value is similar to using 'git- log'\'s --date option. The value is one of the
1205
+ value is similar to using 'git log'\'s --date option. The value is one of the
1206
1206
following alternatives: {relative,local,default,iso,rfc,short}.
1207
1207
See linkgit:git-log[1].
1208
1208
0 commit comments