From: Lucien Kong Date: Tue, 5 Jun 2012 20:21:24 +0000 (+0200) Subject: wt-status.*: better advices for git status added X-Git-Tag: v1.7.12-rc0~69^2~3 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/83c750acde6ac5847845f9c2eeb3261cf9cc54bc?hp=83c750acde6ac5847845f9c2eeb3261cf9cc54bc 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 Signed-off-by: Valentin Duperray Signed-off-by: Franck Jonas Signed-off-by: Thomas Nguy Signed-off-by: Huynh Khoi Nguyen Nguyen Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano ---