git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Add a hint to the output of git-rebase.
@ 2009-06-23 12:40 Daniel Trstenjak
  0 siblings, 0 replies; only message in thread
From: Daniel Trstenjak @ 2009-06-23 12:40 UTC (permalink / raw)
  To: git; +Cc: Daniel Trstenjak

Signed-off-by: Daniel Trstenjak <daniel.trstenjak@science-computing.de>
---
 git-rebase.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/git-rebase.sh b/git-rebase.sh
index 334629f..fc02b89 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -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\".
 "
-- 
1.6.2


-- 
                                                                                                                                           
 Daniel Trstenjak         Tel   : +49 (0)7071-9457-264
 science + computing ag   FAX   : +49 (0)7071-9457-511
 Hagellocher Weg 73       mailto: Daniel.Trstenjak@science-computing.de
 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 

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2009-06-23 12:53 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-23 12:40 [PATCH] Add a hint to the output of git-rebase Daniel Trstenjak

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).