status: better advices when splitting a commit (during rebase -i)
authorLucien Kong <Lucien.Kong@ensimag.imag.fr>
Sun, 10 Jun 2012 11:17:38 +0000 (13:17 +0200)
committerJunio C Hamano <gitster@pobox.com>
Thu, 14 Jun 2012 17:15:20 +0000 (10:15 -0700)
commit2d1ccebae41541946ddd7e32f291f3c8983feea9
tree4c3bec8e95c5d0792ffe9b7e7dacefecc742663c
parent96b0ec1a4c3cafd17bc397c9ac836950c316dab6
status: better advices when splitting a commit (during rebase -i)

Add new informative help messages at the output of 'git status' when
the user is splitting a commit. The code figures this state by
comparing the contents of the following files in the .git/ directory:
  - HEAD
  - ORIG_HEAD
  - rebase-merge/amend
  - rebase-merge/orig-head

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>
t/t7512-status-help.sh
wt-status.c