From: "lode leroy" <lode.leroy@gmail.com>
To: git@vger.kernel.org
Subject: Re: Q: howto rebase
Date: Tue, 25 Sep 2007 16:54:33 +0200 [thread overview]
Message-ID: <b41dbf4a0709250754o189d99fcn4767b37b9ebbdf06@mail.gmail.com> (raw)
In-Reply-To: <b41dbf4a0709250748l52b64155k65b6adb16e8dbcd5@mail.gmail.com>
I'm trying to understand how rebase works, but I need some help to get it.
Suppose I do the following workflow... (see below)
In "version B" I introduce the "fix c", but in "version D" I realize
it should have
been in some other place. (commit D moves the fix to its proper place).
A-B-C-D-E
Now I want to 'rewrite history'.
I would like to move commit D after B
A-B-D'-C'-E
and then fold the commits B and D' into a single commit.
A-B'-C'-E
I somehow managed to get this done using "rebase -i"
by exchanging the 2 appropriate lines, and then deleting the second one,
but I'd like to understand how to do this from the command line...
Could anyone enlighten me? I've read git-rebase(1) several times,
but don't seem to get it right...
cat > file <<EOF
a
b
d
e
g
h
EOF
git add file
git commit -m 'A' -a
cat > file <<EOF
a
b
d
e
g
c
h
EOF
git commit -m 'B' -a
cat > file <<EOF
a
b
d
e
f
g
c
h
EOF
git commit -m 'C' -a
cat > file <<EOF
a
b
c
d
e
f
g
h
EOF
git commit -m 'D' -a
cat > file <<EOF
a
b
c
d
e
f
g
h
i
EOF
git commit -m 'E' -a
next parent reply other threads:[~2007-09-25 14:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <b41dbf4a0709250748l52b64155k65b6adb16e8dbcd5@mail.gmail.com>
2007-09-25 14:54 ` lode leroy [this message]
2007-09-25 14:46 Q: howto rebase lode leroy
2007-09-25 14:49 ` Johannes Schindelin
2007-09-25 15:02 ` Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b41dbf4a0709250754o189d99fcn4767b37b9ebbdf06@mail.gmail.com \
--to=lode.leroy@gmail.com \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).