git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: allstars <allstars.chh@gmail.com>
To: git@vger.kernel.org
Subject: 1 patch to two branches
Date: Thu, 3 Mar 2011 04:46:36 -0800 (PST)	[thread overview]
Message-ID: <38ac3be3-8d09-4a38-b31e-9365fe0f2992@v11g2000prb.googlegroups.com> (raw)

hi
my case is as follows
I have two branches
basically they are the same, except they differ from different package
name(java) and namespace(cpp) due to customer request

but now I have a fix , say a patch
I want to commit it to both branches

but I am lazy so I just want to do just one 'git commit' and 'git
push'

so I am thinking using a githook in remote server
and each commit to branch A can also commit to branch B as well

but I am not quite sure what I should use in the hook

git rebase , git merge or git cherry pick ?

seems these 3 ways all lead to the same result
but I dont know which is better and why


thanks

             reply	other threads:[~2011-03-03 13:27 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-03 12:46 allstars [this message]
2011-03-07  0:56 ` 1 patch to two branches Neal Kreitzinger

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=38ac3be3-8d09-4a38-b31e-9365fe0f2992@v11g2000prb.googlegroups.com \
    --to=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. 
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).