]> git.ipfire.org Git - thirdparty/git.git/blame - Documentation/config/advice.txt
fetch: warn about forced updates in branch listing
[thirdparty/git.git] / Documentation / config / advice.txt
CommitLineData
838ef420
NTND
1advice.*::
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--
377444b4
DS
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.
838ef420
NTND
11 pushUpdateRejected::
12 Set this variable to 'false' if you want to disable
13 'pushNonFFCurrent',
14 'pushNonFFMatching', 'pushAlreadyExists',
15 'pushFetchFirst', and 'pushNeedsForce'
16 simultaneously.
17 pushNonFFCurrent::
18 Advice shown when linkgit:git-push[1] fails due to a
19 non-fast-forward update to the current branch.
20 pushNonFFMatching::
21 Advice shown when you ran linkgit:git-push[1] and pushed
22 'matching refs' explicitly (i.e. you used ':', or
23 specified a refspec that isn't your current branch) and
24 it resulted in a non-fast-forward error.
25 pushAlreadyExists::
26 Shown when linkgit:git-push[1] rejects an update that
27 does not qualify for fast-forwarding (e.g., a tag.)
28 pushFetchFirst::
29 Shown when linkgit:git-push[1] rejects an update that
30 tries to overwrite a remote ref that points at an
31 object we do not have.
32 pushNeedsForce::
33 Shown when linkgit:git-push[1] rejects an update that
34 tries to overwrite a remote ref that points at an
35 object that is not a commit-ish, or make the remote
36 ref point at an object that is not a commit-ish.
dd8dd300
ÆAB
37 pushUnqualifiedRefname::
38 Shown when linkgit:git-push[1] gives up trying to
39 guess based on the source and destination refs what
40 remote ref namespace the source belongs in, but where
41 we can still suggest that the user push to either
42 refs/heads/* or refs/tags/* based on the type of the
43 source object.
838ef420
NTND
44 statusHints::
45 Show directions on how to proceed from the current
46 state in the output of linkgit:git-status[1], in
47 the template shown when writing commit messages in
48 linkgit:git-commit[1], and in the help message shown
49 by linkgit:git-checkout[1] when switching branch.
50 statusUoption::
51 Advise to consider using the `-u` option to linkgit:git-status[1]
52 when the command takes more than 2 seconds to enumerate untracked
53 files.
54 commitBeforeMerge::
55 Advice shown when linkgit:git-merge[1] refuses to
56 merge to avoid overwriting local changes.
57 resetQuiet::
58 Advice to consider using the `--quiet` option to linkgit:git-reset[1]
59 when the command takes more than 2 seconds to enumerate unstaged
60 changes after reset.
61 resolveConflict::
62 Advice shown by various commands when conflicts
63 prevent the operation from being performed.
64 implicitIdentity::
65 Advice on how to set your identity configuration when
66 your information is guessed from the system username and
67 domain name.
68 detachedHead::
69 Advice shown when you used linkgit:git-checkout[1] to
70 move to the detach HEAD state, to instruct how to create
71 a local branch after the fact.
72 checkoutAmbiguousRemoteBranchName::
73 Advice shown when the argument to
74 linkgit:git-checkout[1] ambiguously resolves to a
75 remote tracking branch on more than one remote in
76 situations where an unambiguous argument would have
77 otherwise caused a remote-tracking branch to be
78 checked out. See the `checkout.defaultRemote`
79 configuration variable for how to set a given remote
80 to used by default in some situations where this
81 advice would be printed.
82 amWorkDir::
83 Advice that shows the location of the patch file when
84 linkgit:git-am[1] fails to apply it.
85 rmHints::
86 In case of failure in the output of linkgit:git-rm[1],
87 show directions on how to proceed from the current state.
88 addEmbeddedRepo::
89 Advice on what to do when you've accidentally added one
90 git repo inside of another.
91 ignoredHook::
92 Advice shown if a hook is ignored because the hook is not
93 set as executable.
94 waitingForEditor::
95 Print a message to the terminal whenever Git is waiting for
96 editor input from the user.
eea9c1e7
DL
97 nestedTag::
98 Advice shown if a user attempts to recursively tag a tag object.
838ef420 99--