From: Gelonida <gelonida@gmail.com>
To: git@vger.kernel.org
Subject: how to push from repository with two tracking branches
Date: Thu, 13 May 2010 11:09:11 +0200 [thread overview]
Message-ID: <hsgfjn$onv$1@dough.gmane.org> (raw)
Hi,
I have a repository with two tracking branches ('master' and 'mybranch')
with only one tracking branch I can do
git pull
make_local_changes
git commit -a
git push
with two tracking branches I will be told off if the other branch has
been updated meanwhile, so what I currently to do is:
# 'pull and fastforward mybranch'
git checkout mybranch
git pull
git checkout master
# pull and commit and push as with one tracking branch
git pull
make_local_changes
git commit -a
git push
How can I do this more efficiently?
after a pull to master (I just had to fast forward mybranch to
remote/mybranch)
Switching branches and pulling seems a little clumsy
N
next reply other threads:[~2010-05-13 9:09 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-13 9:09 Gelonida [this message]
2010-05-13 11:57 ` how to push from repository with two tracking branches Jeff King
2010-05-13 12:12 ` Thomas Rast
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='hsgfjn$onv$1@dough.gmane.org' \
--to=gelonida@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).