From: Petr Baudis <pasky@suse.cz>
To: Martin Langhoff <martin.langhoff@gmail.com>
Cc: GIT <git@vger.kernel.org>
Subject: Re: cogito and merging in steps.
Date: Mon, 12 Sep 2005 02:11:05 +0200 [thread overview]
Message-ID: <20050912001105.GC15630@pasky.or.cz> (raw)
In-Reply-To: <46a038f9050822232961140d4b@mail.gmail.com>
Dear diary, on Tue, Aug 23, 2005 at 08:29:46AM CEST, I got a letter
where Martin Langhoff <martin.langhoff@gmail.com> told me that...
> I want to be able to
> - cg-update
> - oops! this is a mess! review with cg-log -r master:origin
> - aha! Here is the conflict in the 9th commit from MacFroz, fire off
> email / open irc session
> - in the meantime, reset the working copy and merge the 8 clean ones
> with something like: cg-restore ; cg-update origin^^^ ; cg-commit
> - cg-update origin^ ; emacs file-with-conflict.c ; cg-commit
> - cg-update # bring in the last pending commit from origin.
>
> How can I achieve the cg-update <somepointinthebranch> ; cg-commit ? I
> mean, without faking a head with
>
> echo <somepointinthebranch> > .git/refs/heads/temphead
Theoretically, it should be as easy as
cg-merge <somepointinthebranch>
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
If you want the holes in your knowledge showing up try teaching
someone. -- Alan Cox
prev parent reply other threads:[~2005-09-12 0:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-08-23 6:29 cogito and merging in steps Martin Langhoff
2005-09-12 0:11 ` Petr Baudis [this message]
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=20050912001105.GC15630@pasky.or.cz \
--to=pasky@suse.cz \
--cc=git@vger.kernel.org \
--cc=martin.langhoff@gmail.com \
/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).