From: Kjetil Barvik <barvik@broadpark.no>
To: git@vger.kernel.org
Cc: Kjetil Barvik <barvik@broadpark.no>
Subject: [PATCH v3] git-rebase-interactive: you can also add new commits to the "work list"
Date: Tue, 10 Feb 2009 00:05:01 +0100 [thread overview]
Message-ID: <1234220701-20652-1-git-send-email-barvik@broadpark.no> (raw)
Add some lines to document that you can also use 'git rebase
--interactive' to add new commits to the rebased patch-series. This
is sort of running multiple 'git cherry-pick' commands in one go.
Signed-off-by: Kjetil Barvik <barvik@broadpark.no>
---
Documentation/git-rebase.txt | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 3d6d429..52c0778 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -318,8 +318,9 @@ Start it with the last commit you want to retain as-is:
An editor will be fired up with all the commits in your current branch
(ignoring merge commits), which come after the given commit. You can
-reorder the commits in this list to your heart's content, and you can
-remove them. The list looks more or less like this:
+reorder the commits in this list to your heart's content, you can
+remove them, and you can also add new commits. The list looks more or
+less like this:
-------------------------------------------
pick deadbee The oneline of this commit
@@ -331,6 +332,9 @@ The oneline descriptions are purely for your pleasure; 'git-rebase' will
not look at them but at the commit names ("deadbee" and "fa1afe1" in this
example), so do not delete or edit the names.
+You can also introduce a new commit into the list, by finding the SHA1
+ref of that new commit, and place a command in front of it.
+
By replacing the command "pick" with the command "edit", you can tell
'git-rebase' to stop after applying that commit, so that you can edit
the files and/or the commit message, amend the commit, and continue
--
1.6.1.349.g99fa5
reply other threads:[~2009-02-09 23:06 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=1234220701-20652-1-git-send-email-barvik@broadpark.no \
--to=barvik@broadpark.no \
--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).