From: Daniel Trstenjak <Daniel.Trstenjak@science-computing.de>
To: git@vger.kernel.org
Cc: Daniel Trstenjak <Daniel.Trstenjak@online.de>
Subject: [PATCH] Add a hint to the output of git-rebase.
Date: Tue, 23 Jun 2009 14:40:18 +0200 [thread overview]
Message-ID: <20090623124018.GA9531@bug.science-computing.de> (raw)
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
reply other threads:[~2009-06-23 12:53 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090623124018.GA9531@bug.science-computing.de \
--to=daniel.trstenjak@science-computing.de \
--cc=Daniel.Trstenjak@online.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).