From: "Imran M Yousuf" <imyousuf@gmail.com>
To: "Junio C Hamano" <gitster@pobox.com>
Cc: "Andrew Arnott" <andrewarnott@gmail.com>, git@vger.kernel.org
Subject: Re: How to merge branches except for one commit
Date: Thu, 29 May 2008 10:38:21 +0600 [thread overview]
Message-ID: <7bfdc29a0805282138kabc5417i4f67ae3995bf238c@mail.gmail.com> (raw)
In-Reply-To: <7vhcchrb43.fsf@gitster.siamese.dyndns.org>
>
> You can never plan ahead perfectly, so do not be too hard on yourself if
> you occasionally screw up. Cherry-picking from time to time is Ok. With
> practice, you will get used to it. I juggle 5 integration branches to
> maintain git.git itself and it took some practice for me to get
> comfortable with the workflow.
>
I always wanted to know how you did it, thanks for sharing it :).
Best regards,
--
Imran M Yousuf
Email: imran@smartitengineering.com
Blog: http://imyousuf-tech.blogs.smartitengineering.com/
Mobile: +880-1711402557
next prev parent reply other threads:[~2008-05-29 4:39 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-29 2:32 How to merge branches except for one commit Andrew Arnott
2008-05-29 2:42 ` Avery Pennarun
2008-05-29 3:01 ` Andrew Arnott
2008-05-29 15:13 ` Andreas Ericsson
2008-05-29 4:24 ` Junio C Hamano
2008-05-29 4:38 ` Imran M Yousuf [this message]
2008-05-29 5:42 ` Andrew Arnott
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=7bfdc29a0805282138kabc5417i4f67ae3995bf238c@mail.gmail.com \
--to=imyousuf@gmail.com \
--cc=andrewarnott@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).