From: Antriksh Pany <antriksh.pany@gmail.com>
To: allstars <allstars.chh@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: rebase on remote branch
Date: Tue, 12 Apr 2011 11:50:02 -0700 [thread overview]
Message-ID: <BANLkTimGQ60TU5WGEWG8b1OdNKOpnb=eCQ@mail.gmail.com> (raw)
In-Reply-To: <6b4c9a4d-075c-4805-8fad-bacecb24e9de@w7g2000pre.googlegroups.com>
>
> or if we use cherry-pick model
>
> 0---0---0---0---*---*---* master
> \
> 0---0---*---*---* release
>
> but in this case , how do we do it in script?
> I mean, how do we know we need to start cherry-pick from the 1st '*'
> to the 3rd '*' in master
>
> more precisely , if A to E represents the commit SHA1
>
> 0---0---0---0---A---B---C---D---E master
> \
> 0---0---A'---B'---C' release
>
> the 3 cherry-picks A' B' C' on release branch won't have the same SHA1
> for A B C in master
> how can we know effectively we need to start cherry-pick from C to E
> on master
>
You can start by using
git log --cherry-pick ....
which compares commits based on their patch contents, not just the SHA1.
You can use a moving tag (say APPLIED) to keep track of till what point
on master you have done the necessary cherry-picks, and then something like
this may work for you:
git log --cherry-pick release..master ^APPLIED
Thanks
Antriksh
prev parent reply other threads:[~2011-04-12 18:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-12 17:17 rebase on remote branch allstars
2011-04-12 18:08 ` Dirk Süsserott
2011-04-12 18:50 ` Antriksh Pany [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
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='BANLkTimGQ60TU5WGEWG8b1OdNKOpnb=eCQ@mail.gmail.com' \
--to=antriksh.pany@gmail.com \
--cc=allstars.chh@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).