Add a hint to the output of git-rebase.
PATCH 1/1 Add a hint to the output of git-rebase.
Signed-off-by Daniel Trstenjak <[email protected]>
--- git-rebase.sh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
git-rebase.sh +2 -1
@@ -36,7 +36,8 @@ cd_to_toplevel OK_TO_SKIP_PRE_REBASE= RESOLVEMSG=" -When you have resolved this problem run \"git rebase --continue\". +When you have resolved this problem add the resolved files with +\"git add\" and then run \"git rebase --continue\". If you would prefer to skip this patch, instead run \"git rebase --skip\". To restore the original branch and stop rebasing run \"git rebase --abort\". "
Signature · 19 lines
1.6.2
--
Daniel Trstenjak Tel : +49 (0)7071-9457-264
science + computing ag FAX : +49 (0)7071-9457-511
Hagellocher Weg 73 mailto: [email protected]
D-72070 Tübingen WWW : http://www.science-computing.de/
--
Vorstand/Board of Management:
Dr. Bernd Finkbeiner, Dr. Roland Niemeier,
Dr. Arno Steitz, Dr. Ingrid Zech
Vorsitzender des Aufsichtsrats/
Chairman of the Supervisory Board:
Michel Lepert
Sitz/Registered Office: Tuebingen
Registergericht/Registration Court: Stuttgart
Registernummer/Commercial Register No.: HRB 382196