{"thread":{"id":"19909","subject":"[PATCH] Add a hint to the output of git-rebase.","startedAt":"2009-06-23T12:40:18Z","lastAt":"2009-06-23T12:40:18Z","messageCount":1,"participants":["Daniel Trstenjak"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"116813","messageId":"20090623124018.GA9531@bug.science-computing.de","threadId":"19909","inReplyTo":null,"subject":"[PATCH] Add a hint to the output of git-rebase.","fromName":"Daniel Trstenjak","fromEmail":"daniel.trstenjak@science-computing.de","sentAt":"2009-06-23T12:40:18Z","receivedAt":"2009-06-23T12:40:18Z","isPatch":true,"sender":{"key":"daniel.trstenjak@science-computing.de","avatar":null},"body":"Signed-off-by: Daniel Trstenjak <daniel.trstenjak@science-computing.de>\n---\n git-rebase.sh |    3 ++-\n 1 files changed, 2 insertions(+), 1 deletions(-)\n\ndiff --git a/git-rebase.sh b/git-rebase.sh\nindex 334629f..fc02b89 100755\n--- a/git-rebase.sh\n+++ b/git-rebase.sh\n@@ -36,7 +36,8 @@ cd_to_toplevel\n \n OK_TO_SKIP_PRE_REBASE=\n RESOLVEMSG=\"\n-When you have resolved this problem run \\\"git rebase --continue\\\".\n+When you have resolved this problem add the resolved files with\n+\\\"git add\\\" and then run \\\"git rebase --continue\\\".\n If you would prefer to skip this patch, instead run \\\"git rebase --skip\\\".\n To restore the original branch and stop rebasing run \\\"git rebase --abort\\\".\n \"\n-- \n1.6.2\n\n\n-- \n                                                                                                                                           \n Daniel Trstenjak         Tel   : +49 (0)7071-9457-264\n science + computing ag   FAX   : +49 (0)7071-9457-511\n Hagellocher Weg 73       mailto: Daniel.Trstenjak@science-computing.de\n D-72070 Tübingen         WWW   : http://www.science-computing.de/                                                                      \n-- \nVorstand/Board of Management:\nDr. Bernd Finkbeiner, Dr. Roland Niemeier, \nDr. Arno Steitz, Dr. Ingrid Zech\nVorsitzender des Aufsichtsrats/\nChairman of the Supervisory Board:\nMichel Lepert\nSitz/Registered Office: Tuebingen\nRegistergericht/Registration Court: Stuttgart\nRegisternummer/Commercial Register No.: HRB 382196 \n"}]}