]> git.ipfire.org Git - thirdparty/git.git/blame - Documentation/config/advice.txt
Git 2.47-rc0
[thirdparty/git.git] / Documentation / config / advice.txt
CommitLineData
838ef420
NTND
1advice.*::
2 These variables control various optional help messages designed to
d919965a
RJ
3 aid new users. When left unconfigured, Git will give the message
4 alongside instructions on how to squelch it. You can tell Git
fb2b9815
DS
5 that you have understood the issue and no longer need a specific
6 help message by setting the corresponding variable to `false`.
7+
8As they are intended to help human users, these messages are output to
9the standard error. When tools that run Git as a subprocess find them
10disruptive, they can set `GIT_ADVICE=0` in the environment to squelch
11all advice messages.
838ef420
NTND
12+
13--
3196029b 14 addEmbeddedRepo::
95c987e6 15 Shown when the user accidentally adds one
3196029b
RJ
16 git repo inside of another.
17 addEmptyPathspec::
3ccc4782 18 Shown when the user runs `git add` without providing
3196029b
RJ
19 the pathspec parameter.
20 addIgnoredFile::
95c987e6 21 Shown when the user attempts to add an ignored file to
3196029b
RJ
22 the index.
23 amWorkDir::
95c987e6
KH
24 Shown when linkgit:git-am[1] fails to apply a patch
25 file, to tell the user the location of the file.
e4921d87 26 ambiguousFetchRefspec::
95c987e6 27 Shown when a fetch refspec for multiple remotes maps to
e4921d87
TK
28 the same remote-tracking branch namespace and causes branch
29 tracking set-up to fail.
3196029b 30 checkoutAmbiguousRemoteBranchName::
95c987e6 31 Shown when the argument to
3196029b
RJ
32 linkgit:git-checkout[1] and linkgit:git-switch[1]
33 ambiguously resolves to a
34 remote tracking branch on more than one remote in
35 situations where an unambiguous argument would have
36 otherwise caused a remote-tracking branch to be
37 checked out. See the `checkout.defaultRemote`
38 configuration variable for how to set a given remote
39 to be used by default in some situations where this
40 advice would be printed.
41 commitBeforeMerge::
95c987e6 42 Shown when linkgit:git-merge[1] refuses to
3196029b
RJ
43 merge to avoid overwriting local changes.
44 detachedHead::
95c987e6 45 Shown when the user uses
3196029b 46 linkgit:git-switch[1] or linkgit:git-checkout[1]
95c987e6
KH
47 to move to the detached HEAD state, to tell the user how
48 to create a local branch after the fact.
3196029b 49 diverging::
95c987e6 50 Shown when a fast-forward is not possible.
377444b4 51 fetchShowForcedUpdates::
95c987e6 52 Shown when linkgit:git-fetch[1] takes a long time
377444b4
DS
53 to calculate forced updates after ref updates, or to warn
54 that the check is disabled.
bec9bb4b 55 forceDeleteBranch::
95c987e6 56 Shown when the user tries to delete a not fully merged
bec9bb4b 57 branch without the force option set.
3196029b 58 ignoredHook::
95c987e6 59 Shown when a hook is ignored because the hook is not
3196029b
RJ
60 set as executable.
61 implicitIdentity::
95c987e6
KH
62 Shown when the user's information is guessed from the
63 system username and domain name, to tell the user how to
64 set their identity configuration.
ec030091
PB
65 mergeConflict::
66 Shown when various commands stop because of conflicts.
3196029b 67 nestedTag::
95c987e6 68 Shown when a user attempts to recursively tag a tag object.
838ef420
NTND
69 pushAlreadyExists::
70 Shown when linkgit:git-push[1] rejects an update that
71 does not qualify for fast-forwarding (e.g., a tag.)
72 pushFetchFirst::
73 Shown when linkgit:git-push[1] rejects an update that
74 tries to overwrite a remote ref that points at an
75 object we do not have.
76 pushNeedsForce::
77 Shown when linkgit:git-push[1] rejects an update that
78 tries to overwrite a remote ref that points at an
79 object that is not a commit-ish, or make the remote
80 ref point at an object that is not a commit-ish.
3196029b 81 pushNonFFCurrent::
95c987e6 82 Shown when linkgit:git-push[1] fails due to a
3196029b
RJ
83 non-fast-forward update to the current branch.
84 pushNonFFMatching::
95c987e6 85 Shown when the user ran linkgit:git-push[1] and pushed
15cb0372 86 "matching refs" explicitly (i.e. used `:`, or
95c987e6 87 specified a refspec that isn't the current branch) and
3196029b
RJ
88 it resulted in a non-fast-forward error.
89 pushRefNeedsUpdate::
90 Shown when linkgit:git-push[1] rejects a forced update of
91 a branch when its remote-tracking ref has updates that we
92 do not have locally.
dd8dd300
ÆAB
93 pushUnqualifiedRefname::
94 Shown when linkgit:git-push[1] gives up trying to
95 guess based on the source and destination refs what
96 remote ref namespace the source belongs in, but where
97 we can still suggest that the user push to either
3ccc4782 98 `refs/heads/*` or `refs/tags/*` based on the type of the
dd8dd300 99 source object.
3196029b 100 pushUpdateRejected::
3ccc4782
KH
101 Set this variable to `false` if you want to disable
102 `pushNonFFCurrent`, `pushNonFFMatching`, `pushAlreadyExists`,
103 `pushFetchFirst`, `pushNeedsForce`, and `pushRefNeedsUpdate`
3196029b 104 simultaneously.
4c063c82
PW
105 rebaseTodoError::
106 Shown when there is an error after editing the rebase todo list.
8fbd903e
KH
107 refSyntax::
108 Shown when the user provides an illegal ref name, to
109 tell the user about the ref syntax documentation.
3196029b 110 resetNoRefresh::
95c987e6
KH
111 Shown when linkgit:git-reset[1] takes more than 2
112 seconds to refresh the index after reset, to tell the user
113 that they can use the `--no-refresh` option.
3196029b 114 resolveConflict::
95c987e6 115 Shown by various commands when conflicts
3196029b
RJ
116 prevent the operation from being performed.
117 rmHints::
95c987e6
KH
118 Shown on failure in the output of linkgit:git-rm[1], to
119 give directions on how to proceed from the current state.
3196029b 120 sequencerInUse::
95c987e6 121 Shown when a sequencer command is already in progress.
767a4ca6
JS
122 skippedCherryPicks::
123 Shown when linkgit:git-rebase[1] skips a commit that has already
124 been cherry-picked onto the upstream branch.
9479a31d
DS
125 sparseIndexExpanded::
126 Shown when a sparse index is expanded to a full index, which is likely
127 due to an unexpected set of files existing outside of the
128 sparse-checkout.
0a53561a
JH
129 statusAheadBehind::
130 Shown when linkgit:git-status[1] computes the ahead/behind
131 counts for a local ref compared to its remote tracking ref,
132 and that calculation takes longer than expected. Will not
133 appear if `status.aheadBehind` is false or the option
134 `--no-ahead-behind` is given.
838ef420
NTND
135 statusHints::
136 Show directions on how to proceed from the current
137 state in the output of linkgit:git-status[1], in
138 the template shown when writing commit messages in
139 linkgit:git-commit[1], and in the help message shown
d787d311 140 by linkgit:git-switch[1] or
6cc668c0 141 linkgit:git-checkout[1] when switching branches.
838ef420 142 statusUoption::
95c987e6
KH
143 Shown when linkgit:git-status[1] takes more than 2
144 seconds to enumerate untracked files, to tell the user that
145 they can use the `-u` option.
3901d2c6 146 submoduleAlternateErrorStrategyDie::
95c987e6 147 Shown when a submodule.alternateErrorStrategy option
4f3e57ef 148 configured to "die" causes a fatal error.
b9e55be7
PB
149 submoduleMergeConflict::
150 Advice shown when a non-trivial submodule merge conflict is
151 encountered.
961b130d 152 submodulesNotUpdated::
95c987e6 153 Shown when a user runs a submodule command that fails
961b130d 154 because `git submodule update --init` was not run.
3196029b 155 suggestDetachingHead::
95c987e6 156 Shown when linkgit:git-switch[1] refuses to detach HEAD
3196029b 157 without the explicit `--detach` option.
a20f7047 158 updateSparsePath::
95c987e6 159 Shown when either linkgit:git-add[1] or linkgit:git-rm[1]
d5f4b826
MT
160 is asked to update index entries outside the current sparse
161 checkout.
3196029b 162 waitingForEditor::
95c987e6
KH
163 Shown when Git is waiting for editor input. Relevant
164 when e.g. the editor is not launched inside the terminal.
35f0383c 165 worktreeAddOrphan::
95c987e6
KH
166 Shown when the user tries to create a worktree from an
167 invalid reference, to tell the user how to create a new unborn
35f0383c 168 branch instead.
838ef420 169--