]> git.ipfire.org Git - thirdparty/git.git/blob - Documentation/config/advice.txt
Merge branch 'es/perf-export-fix'
[thirdparty/git.git] / Documentation / config / advice.txt
1 advice.*::
2 These variables control various optional help messages designed to
3 aid new users. All 'advice.*' variables default to 'true', and you
4 can tell Git that you do not need help by setting these to 'false':
5 +
6 --
7 fetchShowForcedUpdates::
8 Advice shown when linkgit:git-fetch[1] takes a long time
9 to calculate forced updates after ref updates, or to warn
10 that the check is disabled.
11 pushUpdateRejected::
12 Set this variable to 'false' if you want to disable
13 'pushNonFFCurrent', 'pushNonFFMatching', 'pushAlreadyExists',
14 'pushFetchFirst', 'pushNeedsForce', and 'pushRefNeedsUpdate'
15 simultaneously.
16 pushNonFFCurrent::
17 Advice shown when linkgit:git-push[1] fails due to a
18 non-fast-forward update to the current branch.
19 pushNonFFMatching::
20 Advice shown when you ran linkgit:git-push[1] and pushed
21 'matching refs' explicitly (i.e. you used ':', or
22 specified a refspec that isn't your current branch) and
23 it resulted in a non-fast-forward error.
24 pushAlreadyExists::
25 Shown when linkgit:git-push[1] rejects an update that
26 does not qualify for fast-forwarding (e.g., a tag.)
27 pushFetchFirst::
28 Shown when linkgit:git-push[1] rejects an update that
29 tries to overwrite a remote ref that points at an
30 object we do not have.
31 pushNeedsForce::
32 Shown when linkgit:git-push[1] rejects an update that
33 tries to overwrite a remote ref that points at an
34 object that is not a commit-ish, or make the remote
35 ref point at an object that is not a commit-ish.
36 pushUnqualifiedRefname::
37 Shown when linkgit:git-push[1] gives up trying to
38 guess based on the source and destination refs what
39 remote ref namespace the source belongs in, but where
40 we can still suggest that the user push to either
41 refs/heads/* or refs/tags/* based on the type of the
42 source object.
43 pushRefNeedsUpdate::
44 Shown when linkgit:git-push[1] rejects a forced update of
45 a branch when its remote-tracking ref has updates that we
46 do not have locally.
47 statusAheadBehind::
48 Shown when linkgit:git-status[1] computes the ahead/behind
49 counts for a local ref compared to its remote tracking ref,
50 and that calculation takes longer than expected. Will not
51 appear if `status.aheadBehind` is false or the option
52 `--no-ahead-behind` is given.
53 statusHints::
54 Show directions on how to proceed from the current
55 state in the output of linkgit:git-status[1], in
56 the template shown when writing commit messages in
57 linkgit:git-commit[1], and in the help message shown
58 by linkgit:git-switch[1] or
59 linkgit:git-checkout[1] when switching branch.
60 statusUoption::
61 Advise to consider using the `-u` option to linkgit:git-status[1]
62 when the command takes more than 2 seconds to enumerate untracked
63 files.
64 commitBeforeMerge::
65 Advice shown when linkgit:git-merge[1] refuses to
66 merge to avoid overwriting local changes.
67 resetQuiet::
68 Advice to consider using the `--quiet` option to linkgit:git-reset[1]
69 when the command takes more than 2 seconds to enumerate unstaged
70 changes after reset.
71 resolveConflict::
72 Advice shown by various commands when conflicts
73 prevent the operation from being performed.
74 sequencerInUse::
75 Advice shown when a sequencer command is already in progress.
76 implicitIdentity::
77 Advice on how to set your identity configuration when
78 your information is guessed from the system username and
79 domain name.
80 detachedHead::
81 Advice shown when you used
82 linkgit:git-switch[1] or linkgit:git-checkout[1]
83 to move to the detach HEAD state, to instruct how to
84 create a local branch after the fact.
85 checkoutAmbiguousRemoteBranchName::
86 Advice shown when the argument to
87 linkgit:git-checkout[1] and linkgit:git-switch[1]
88 ambiguously resolves to a
89 remote tracking branch on more than one remote in
90 situations where an unambiguous argument would have
91 otherwise caused a remote-tracking branch to be
92 checked out. See the `checkout.defaultRemote`
93 configuration variable for how to set a given remote
94 to used by default in some situations where this
95 advice would be printed.
96 amWorkDir::
97 Advice that shows the location of the patch file when
98 linkgit:git-am[1] fails to apply it.
99 rmHints::
100 In case of failure in the output of linkgit:git-rm[1],
101 show directions on how to proceed from the current state.
102 addEmbeddedRepo::
103 Advice on what to do when you've accidentally added one
104 git repo inside of another.
105 ignoredHook::
106 Advice shown if a hook is ignored because the hook is not
107 set as executable.
108 waitingForEditor::
109 Print a message to the terminal whenever Git is waiting for
110 editor input from the user.
111 nestedTag::
112 Advice shown if a user attempts to recursively tag a tag object.
113 submoduleAlternateErrorStrategyDie::
114 Advice shown when a submodule.alternateErrorStrategy option
115 configured to "die" causes a fatal error.
116 addIgnoredFile::
117 Advice shown if a user attempts to add an ignored file to
118 the index.
119 addEmptyPathspec::
120 Advice shown if a user runs the add command without providing
121 the pathspec parameter.
122 --