From: Andreas Ericsson <ae@op5•se>
To: Bruno Haible <bruno@clisp•org>
Cc: Elijah Newren <newren@gmail•com>, git@vger•kernel.org
Subject: Re: request for documentation about branch surgery
Date: Tue, 07 Jul 2009 12:06:40 +0200 [thread overview]
Message-ID: <4A531E30.5040907@op5.se> (raw)
In-Reply-To: <200907071151.03567.bruno@clisp.org>
Bruno Haible wrote:
> I said.
>
> Still, can someone please extend the cited chapter of the user's manual,
Presumably you can. I'll jot down some notes for you though ;-)
> so that it answers these questions?
> - How do I insert some commits between other commits in a branch?
> [TODO]
git rebase --interactive (don't do this on published branches).
> - How do I reorder commits in a branch? [TODO - mention "git rebase -i"]
git rebase --interactive
> - How do I cut a branch? [TODO]
Define "cut". Possibly "git branch -d" or it's less forgiving
sibling "git branch -D", in case the branch to be removed isn't
fully merged.
> - How do I replace a branch tip with the contents of another branch?
> [TODO]
Easily understandable:
git checkout branch
git reset --hard otherbranch
The low-level way:
git update-ref [-m <reason>] [--no-deref] <full-ref-name> <newvalue>
There are more options to git-update-ref. The man-page lists them all.
> - How do I reconnect a branch to another branch point?
> [TODO]
I don't quite understand what you mean by "reconnect", but this might
do something along the lines of what you want:
git checkout branch-to-connect-to
git merge branch-to-be-connected
--
Andreas Ericsson andreas.ericsson@op5•se
OP5 AB www.op5.se
Tel: +46 8-230225 Fax: +46 8-230231
Considering the successes of the wars on alcohol, poverty, drugs and
terror, I think we should give some serious thought to declaring war
on peace.
next prev parent reply other threads:[~2009-07-07 10:06 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-06 23:05 request for documentation about branch surgery Bruno Haible
2009-07-07 2:30 ` Elijah Newren
2009-07-07 3:45 ` Elijah Newren
2009-07-07 9:51 ` Bruno Haible
2009-07-07 10:06 ` Andreas Ericsson [this message]
2009-07-07 2:50 ` Junio C Hamano
2009-07-07 10:13 ` Bruno Haible
2009-07-07 11:03 ` Andreas Ericsson
2009-07-07 15:52 ` Junio C Hamano
2009-07-07 18:28 ` Daniel Barkalow
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=4A531E30.5040907@op5.se \
--to=ae@op5$(echo .)se \
--cc=bruno@clisp$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
--cc=newren@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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