diff options
| author |  Lucien Kong <Lucien.Kong@ensimag.imag.fr> | 2012-06-05 22:21:24 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-06-14 10:15:19 -0700 |
| commit | 83c750acde6ac5847845f9c2eeb3261cf9cc54bc (patch) | |
| tree | 7d942525b5580498d3d570f428bd70e3c33f1736 /t/t4013/diff.diff_--patch-with-stat_initial..side | |
| parent | Git 1.7.11-rc1 (diff) | |
| download | tgif-83c750acde6ac5847845f9c2eeb3261cf9cc54bc.tar.xz | |
wt-status.*: better advices for git status added
This patch provides new informative help messages in the display of
'git status' (at the top) during conflicts, rebase, am, bisect or
cherry-pick process.
The new messages are not shown when using options such as -s or
--porcelain. The messages about the current situation of the user are
always displayed but the advices on what the user needs to do in order
to resume a rebase/bisect/am/commit after resolving conflicts can be
hidden by setting advice.statushints to 'false' in the config file.
Thus, information about the updated advice.statushints key are added
in Documentation/config.txt.
Also, the test t7060-wt-status.sh is now working with the new help
messages. Tests about suggestions of "git rm" are also added.
Signed-off-by: Lucien Kong <Lucien.Kong@ensimag.imag.fr>
Signed-off-by: Valentin Duperray <Valentin.Duperray@ensimag.imag.fr>
Signed-off-by: Franck Jonas <Franck.Jonas@ensimag.imag.fr>
Signed-off-by: Thomas Nguy <Thomas.Nguy@ensimag.imag.fr>
Signed-off-by: Huynh Khoi Nguyen Nguyen <Huynh-Khoi-Nguyen.Nguyen@ensimag.imag.fr>
Signed-off-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.diff_--patch-with-stat_initial..side')
0 files changed, 0 insertions, 0 deletions