diff options
Diffstat (limited to 'git-config.html')
| -rw-r--r-- | git-config.html | 263 |
1 files changed, 136 insertions, 127 deletions
diff --git a/git-config.html b/git-config.html index 5e9b7552d..544f05402 100644 --- a/git-config.html +++ b/git-config.html @@ -1991,243 +1991,243 @@ advice.* <div class="content">
<div class="dlist"><dl>
<dt class="hdlist1">
-ambiguousFetchRefspec
+addEmbeddedRepo
</dt>
<dd>
<p>
- Advice shown when a fetch refspec for multiple remotes maps to
- the same remote-tracking branch namespace and causes branch
- tracking set-up to fail.
+ Advice on what to do when you’ve accidentally added one
+ git repo inside of another.
</p>
</dd>
<dt class="hdlist1">
-fetchShowForcedUpdates
+addEmptyPathspec
</dt>
<dd>
<p>
- Advice shown when <a href="git-fetch.html">git-fetch(1)</a> takes a long time
- to calculate forced updates after ref updates, or to warn
- that the check is disabled.
+ Advice shown if a user runs the add command without providing
+ the pathspec parameter.
</p>
</dd>
<dt class="hdlist1">
-pushUpdateRejected
+addIgnoredFile
</dt>
<dd>
<p>
- Set this variable to <em>false</em> if you want to disable
- <em>pushNonFFCurrent</em>, <em>pushNonFFMatching</em>, <em>pushAlreadyExists</em>,
- <em>pushFetchFirst</em>, <em>pushNeedsForce</em>, and <em>pushRefNeedsUpdate</em>
- simultaneously.
+ Advice shown if a user attempts to add an ignored file to
+ the index.
</p>
</dd>
<dt class="hdlist1">
-pushNonFFCurrent
+amWorkDir
</dt>
<dd>
<p>
- Advice shown when <a href="git-push.html">git-push(1)</a> fails due to a
- non-fast-forward update to the current branch.
+ Advice that shows the location of the patch file when
+ <a href="git-am.html">git-am(1)</a> fails to apply it.
</p>
</dd>
<dt class="hdlist1">
-pushNonFFMatching
+ambiguousFetchRefspec
</dt>
<dd>
<p>
- Advice shown when you ran <a href="git-push.html">git-push(1)</a> and pushed
- <em>matching refs</em> explicitly (i.e. you used <em>:</em>, or
- specified a refspec that isn’t your current branch) and
- it resulted in a non-fast-forward error.
+ Advice shown when a fetch refspec for multiple remotes maps to
+ the same remote-tracking branch namespace and causes branch
+ tracking set-up to fail.
</p>
</dd>
<dt class="hdlist1">
-pushAlreadyExists
+checkoutAmbiguousRemoteBranchName
</dt>
<dd>
<p>
- Shown when <a href="git-push.html">git-push(1)</a> rejects an update that
- does not qualify for fast-forwarding (e.g., a tag.)
+ Advice shown when the argument to
+ <a href="git-checkout.html">git-checkout(1)</a> and <a href="git-switch.html">git-switch(1)</a>
+ ambiguously resolves to a
+ remote tracking branch on more than one remote in
+ situations where an unambiguous argument would have
+ otherwise caused a remote-tracking branch to be
+ checked out. See the <code>checkout.defaultRemote</code>
+ configuration variable for how to set a given remote
+ to be used by default in some situations where this
+ advice would be printed.
</p>
</dd>
<dt class="hdlist1">
-pushFetchFirst
+commitBeforeMerge
</dt>
<dd>
<p>
- Shown when <a href="git-push.html">git-push(1)</a> rejects an update that
- tries to overwrite a remote ref that points at an
- object we do not have.
+ Advice shown when <a href="git-merge.html">git-merge(1)</a> refuses to
+ merge to avoid overwriting local changes.
</p>
</dd>
<dt class="hdlist1">
-pushNeedsForce
+detachedHead
</dt>
<dd>
<p>
- Shown when <a href="git-push.html">git-push(1)</a> rejects an update that
- tries to overwrite a remote ref that points at an
- object that is not a commit-ish, or make the remote
- ref point at an object that is not a commit-ish.
+ Advice shown when you used
+ <a href="git-switch.html">git-switch(1)</a> or <a href="git-checkout.html">git-checkout(1)</a>
+ to move to the detached HEAD state, to instruct how to
+ create a local branch after the fact.
</p>
</dd>
<dt class="hdlist1">
-pushUnqualifiedRefname
+diverging
</dt>
<dd>
<p>
- Shown when <a href="git-push.html">git-push(1)</a> gives up trying to
- guess based on the source and destination refs what
- remote ref namespace the source belongs in, but where
- we can still suggest that the user push to either
- refs/heads/* or refs/tags/* based on the type of the
- source object.
+ Advice shown when a fast-forward is not possible.
</p>
</dd>
<dt class="hdlist1">
-pushRefNeedsUpdate
+fetchShowForcedUpdates
</dt>
<dd>
<p>
- Shown when <a href="git-push.html">git-push(1)</a> rejects a forced update of
- a branch when its remote-tracking ref has updates that we
- do not have locally.
+ Advice shown when <a href="git-fetch.html">git-fetch(1)</a> takes a long time
+ to calculate forced updates after ref updates, or to warn
+ that the check is disabled.
</p>
</dd>
<dt class="hdlist1">
-skippedCherryPicks
+forceDeleteBranch
</dt>
<dd>
<p>
- Shown when <a href="git-rebase.html">git-rebase(1)</a> skips a commit that has already
- been cherry-picked onto the upstream branch.
+ Advice shown when a user tries to delete a not fully merged
+ branch without the force option set.
</p>
</dd>
<dt class="hdlist1">
-statusAheadBehind
+ignoredHook
</dt>
<dd>
<p>
- Shown when <a href="git-status.html">git-status(1)</a> computes the ahead/behind
- counts for a local ref compared to its remote tracking ref,
- and that calculation takes longer than expected. Will not
- appear if <code>status.aheadBehind</code> is false or the option
- <code>--no-ahead-behind</code> is given.
+ Advice shown if a hook is ignored because the hook is not
+ set as executable.
</p>
</dd>
<dt class="hdlist1">
-statusHints
+implicitIdentity
</dt>
<dd>
<p>
- Show directions on how to proceed from the current
- state in the output of <a href="git-status.html">git-status(1)</a>, in
- the template shown when writing commit messages in
- <a href="git-commit.html">git-commit(1)</a>, and in the help message shown
- by <a href="git-switch.html">git-switch(1)</a> or
- <a href="git-checkout.html">git-checkout(1)</a> when switching branches.
+ Advice on how to set your identity configuration when
+ your information is guessed from the system username and
+ domain name.
</p>
</dd>
<dt class="hdlist1">
-statusUoption
+nestedTag
</dt>
<dd>
<p>
- Advise to consider using the <code>-u</code> option to <a href="git-status.html">git-status(1)</a>
- when the command takes more than 2 seconds to enumerate untracked
- files.
+ Advice shown if a user attempts to recursively tag a tag object.
</p>
</dd>
<dt class="hdlist1">
-commitBeforeMerge
+pushAlreadyExists
</dt>
<dd>
<p>
- Advice shown when <a href="git-merge.html">git-merge(1)</a> refuses to
- merge to avoid overwriting local changes.
+ Shown when <a href="git-push.html">git-push(1)</a> rejects an update that
+ does not qualify for fast-forwarding (e.g., a tag.)
</p>
</dd>
<dt class="hdlist1">
-resetNoRefresh
+pushFetchFirst
</dt>
<dd>
<p>
- Advice to consider using the <code>--no-refresh</code> option to
- <a href="git-reset.html">git-reset(1)</a> when the command takes more than 2 seconds
- to refresh the index after reset.
+ Shown when <a href="git-push.html">git-push(1)</a> rejects an update that
+ tries to overwrite a remote ref that points at an
+ object we do not have.
</p>
</dd>
<dt class="hdlist1">
-resolveConflict
+pushNeedsForce
</dt>
<dd>
<p>
- Advice shown by various commands when conflicts
- prevent the operation from being performed.
+ Shown when <a href="git-push.html">git-push(1)</a> rejects an update that
+ tries to overwrite a remote ref that points at an
+ object that is not a commit-ish, or make the remote
+ ref point at an object that is not a commit-ish.
</p>
</dd>
<dt class="hdlist1">
-sequencerInUse
+pushNonFFCurrent
</dt>
<dd>
<p>
- Advice shown when a sequencer command is already in progress.
+ Advice shown when <a href="git-push.html">git-push(1)</a> fails due to a
+ non-fast-forward update to the current branch.
</p>
</dd>
<dt class="hdlist1">
-implicitIdentity
+pushNonFFMatching
</dt>
<dd>
<p>
- Advice on how to set your identity configuration when
- your information is guessed from the system username and
- domain name.
+ Advice shown when you ran <a href="git-push.html">git-push(1)</a> and pushed
+ <em>matching refs</em> explicitly (i.e. you used <em>:</em>, or
+ specified a refspec that isn’t your current branch) and
+ it resulted in a non-fast-forward error.
</p>
</dd>
<dt class="hdlist1">
-detachedHead
+pushRefNeedsUpdate
</dt>
<dd>
<p>
- Advice shown when you used
- <a href="git-switch.html">git-switch(1)</a> or <a href="git-checkout.html">git-checkout(1)</a>
- to move to the detached HEAD state, to instruct how to
- create a local branch after the fact.
+ Shown when <a href="git-push.html">git-push(1)</a> rejects a forced update of
+ a branch when its remote-tracking ref has updates that we
+ do not have locally.
</p>
</dd>
<dt class="hdlist1">
-suggestDetachingHead
+pushUnqualifiedRefname
</dt>
<dd>
<p>
- Advice shown when <a href="git-switch.html">git-switch(1)</a> refuses to detach HEAD
- without the explicit <code>--detach</code> option.
+ Shown when <a href="git-push.html">git-push(1)</a> gives up trying to
+ guess based on the source and destination refs what
+ remote ref namespace the source belongs in, but where
+ we can still suggest that the user push to either
+ refs/heads/* or refs/tags/* based on the type of the
+ source object.
</p>
</dd>
<dt class="hdlist1">
-checkoutAmbiguousRemoteBranchName
+pushUpdateRejected
</dt>
<dd>
<p>
- Advice shown when the argument to
- <a href="git-checkout.html">git-checkout(1)</a> and <a href="git-switch.html">git-switch(1)</a>
- ambiguously resolves to a
- remote tracking branch on more than one remote in
- situations where an unambiguous argument would have
- otherwise caused a remote-tracking branch to be
- checked out. See the <code>checkout.defaultRemote</code>
- configuration variable for how to set a given remote
- to be used by default in some situations where this
- advice would be printed.
+ Set this variable to <em>false</em> if you want to disable
+ <em>pushNonFFCurrent</em>, <em>pushNonFFMatching</em>, <em>pushAlreadyExists</em>,
+ <em>pushFetchFirst</em>, <em>pushNeedsForce</em>, and <em>pushRefNeedsUpdate</em>
+ simultaneously.
</p>
</dd>
<dt class="hdlist1">
-amWorkDir
+resetNoRefresh
</dt>
<dd>
<p>
- Advice that shows the location of the patch file when
- <a href="git-am.html">git-am(1)</a> fails to apply it.
+ Advice to consider using the <code>--no-refresh</code> option to
+ <a href="git-reset.html">git-reset(1)</a> when the command takes more than 2 seconds
+ to refresh the index after reset.
+</p>
+</dd>
+<dt class="hdlist1">
+resolveConflict
+</dt>
+<dd>
+<p>
+ Advice shown by various commands when conflicts
+ prevent the operation from being performed.
</p>
</dd>
<dt class="hdlist1">
@@ -2240,74 +2240,82 @@ rmHints </p>
</dd>
<dt class="hdlist1">
-addEmbeddedRepo
+sequencerInUse
</dt>
<dd>
<p>
- Advice on what to do when you’ve accidentally added one
- git repo inside of another.
+ Advice shown when a sequencer command is already in progress.
</p>
</dd>
<dt class="hdlist1">
-ignoredHook
+skippedCherryPicks
</dt>
<dd>
<p>
- Advice shown if a hook is ignored because the hook is not
- set as executable.
+ Shown when <a href="git-rebase.html">git-rebase(1)</a> skips a commit that has already
+ been cherry-picked onto the upstream branch.
</p>
</dd>
<dt class="hdlist1">
-waitingForEditor
+statusAheadBehind
</dt>
<dd>
<p>
- Print a message to the terminal whenever Git is waiting for
- editor input from the user.
+ Shown when <a href="git-status.html">git-status(1)</a> computes the ahead/behind
+ counts for a local ref compared to its remote tracking ref,
+ and that calculation takes longer than expected. Will not
+ appear if <code>status.aheadBehind</code> is false or the option
+ <code>--no-ahead-behind</code> is given.
</p>
</dd>
<dt class="hdlist1">
-nestedTag
+statusHints
</dt>
<dd>
<p>
- Advice shown if a user attempts to recursively tag a tag object.
+ Show directions on how to proceed from the current
+ state in the output of <a href="git-status.html">git-status(1)</a>, in
+ the template shown when writing commit messages in
+ <a href="git-commit.html">git-commit(1)</a>, and in the help message shown
+ by <a href="git-switch.html">git-switch(1)</a> or
+ <a href="git-checkout.html">git-checkout(1)</a> when switching branches.
</p>
</dd>
<dt class="hdlist1">
-submoduleAlternateErrorStrategyDie
+statusUoption
</dt>
<dd>
<p>
- Advice shown when a submodule.alternateErrorStrategy option
- configured to "die" causes a fatal error.
+ Advise to consider using the <code>-u</code> option to <a href="git-status.html">git-status(1)</a>
+ when the command takes more than 2 seconds to enumerate untracked
+ files.
</p>
</dd>
<dt class="hdlist1">
-submodulesNotUpdated
+submoduleAlternateErrorStrategyDie
</dt>
<dd>
<p>
- Advice shown when a user runs a submodule command that fails
- because <code>git submodule update --init</code> was not run.
+ Advice shown when a submodule.alternateErrorStrategy option
+ configured to "die" causes a fatal error.
</p>
</dd>
<dt class="hdlist1">
-addIgnoredFile
+submodulesNotUpdated
</dt>
<dd>
<p>
- Advice shown if a user attempts to add an ignored file to
- the index.
+ Advice shown when a user runs a submodule command that fails
+ because <code>git submodule update --init</code> was not run.
</p>
</dd>
<dt class="hdlist1">
-addEmptyPathspec
+suggestDetachingHead
</dt>
<dd>
<p>
- Advice shown if a user runs the add command without providing
- the pathspec parameter.
+ Advice shown when <a href="git-switch.html">git-switch(1)</a> refuses to detach HEAD
+ without the explicit <code>--detach</code> option.
</p>
</dd>
<dt class="hdlist1">
@@ -2321,11 +2329,12 @@ updateSparsePath </p>
</dd>
<dt class="hdlist1">
-diverging
+waitingForEditor
</dt>
<dd>
<p>
- Advice shown when a fast-forward is not possible.
+ Print a message to the terminal whenever Git is waiting for
+ editor input from the user.
</p>
</dd>
<dt class="hdlist1">
|