diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-06-28 15:20:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-28 15:20:35 -0700 |
| commit | 30e8e6fdeadbd7c3f7dd8defed654e1e98290a45 (patch) | |
| tree | 0cfc87e044491a1879cef0eb6258c4eb0562e13c /Documentation | |
| parent | fbc9724188fb4040e1f248de1e61752b385c1841 (diff) | |
| parent | 2d1ccebae41541946ddd7e32f291f3c8983feea9 (diff) | |
| download | git-30e8e6fdeadbd7c3f7dd8defed654e1e98290a45.tar.gz | |
Merge branch 'lk/more-helpful-status-hints'
Give finer classification to various states of paths in conflicted
state and offer advice messages in the "git status" output.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 915cb5a547..ccce4f6697 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -159,9 +159,10 @@ advice.*:: specified a refspec that isn't your current branch) and it resulted in a non-fast-forward error. statusHints:: - Directions on how to stage/unstage/add shown in the - output of linkgit:git-status[1] and the template shown - when writing commit messages. + Show directions on how to proceed from the current + state in the output of linkgit:git-status[1] and in + the template shown when writing commit messages in + linkgit:git-commit[1]. commitBeforeMerge:: Advice shown when linkgit:git-merge[1] refuses to merge to avoid overwriting local changes. |