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