diff options
| author |  Matthieu Moy <Matthieu.Moy@imag.fr> | 2012-12-04 10:15:03 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-12-04 07:57:30 -0800 |
| commit | 552755a88b3b4c28166336a0f4ffac08cf43fb89 (patch) | |
| tree | 9d236738bb4816857c68283b868d09ea47df985e | |
| parent | status: respect advice.statusHints for ahead/behind advice (diff) | |
| download | tgif-552755a88b3b4c28166336a0f4ffac08cf43fb89.tar.xz | |
document that statusHints affects git checkout
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/config.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 11f320b962..ae572a937e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -160,9 +160,10 @@ advice.*:: it resulted in a non-fast-forward error. statusHints:: Show directions on how to proceed from the current - state in the output of linkgit:git-status[1] and in + state in the output of linkgit:git-status[1], in the template shown when writing commit messages in - linkgit:git-commit[1]. + linkgit:git-commit[1], and in the help message shown + by linkgit:git-checkout[1] when switching branch. commitBeforeMerge:: Advice shown when linkgit:git-merge[1] refuses to merge to avoid overwriting local changes. |