diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-12-04 13:34:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-12-04 13:34:10 -0800 |
| commit | fb4c62235fee8008d99ef55c4adcb1f7ea9508a3 (patch) | |
| tree | e4ef44ddad2918505339de1b584506d46a792756 /Documentation/config.txt | |
| parent | ee26a6e2b87905ac605c27841f607cb3379ca678 (diff) | |
| parent | 552755a88b3b4c28166336a0f4ffac08cf43fb89 (diff) | |
| download | git-fb4c62235fee8008d99ef55c4adcb1f7ea9508a3.tar.gz | |
Merge branch 'mm/status-push-pull-advise'
* mm/status-push-pull-advise:
document that statusHints affects git checkout
Diffstat (limited to 'Documentation/config.txt')
| -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 e70216dfe6..bf8f911e1f 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. |