From: Hallvard B Furuseth <h.b.furuseth@usit.uio.no>
To: lists@haller-berlin.de (Stefan Haller)
Cc: gelonida@gmail.com (Gelonida N), git@vger.kernel.org
Subject: Re: best way to fastforward all tracking branches after a fetch
Date: Sun, 11 Dec 2011 23:22:50 +0100 [thread overview]
Message-ID: <hbf.20111211x512@bombur.uio.no> (raw)
In-Reply-To: <1kc4qnw.1xgi3yf14oaw7gM%lists@haller-berlin.de>
Stefan Haller writes:
>Gelonida N <gelonida@gmail.com> wrote:
>
>> What is the best way to fastforward all fastforwardable tracking
>> branches after a git fetch?
>
> Here's a script that does this. It isn't very well tested, I hope I
> didn't miss any edge cases. Use at your own risk.
Local branches can track each other. So the script needs to toposort
the branches, or to loop until either nothing was done or an error
happened. (The latter to prevent an eternal loop on error.)
I've wished for a more limited 'git ff' command than this:
- git update-ref --ff-only, and branch/fetch options based on this.
- Fast-forward only the branches tracking one particular remote/branch,
and maybe branches tracking the fast-forwarded branches.
- Fast-forward to another remote or branch than the tracked one.
I have a few aliases for it, but never thought much of a good common
design.
--
Hallvard
next prev parent reply other threads:[~2011-12-11 22:42 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-10 12:26 best way to fastforward all tracking branches after a fetch Gelonida N
2011-12-11 2:22 ` Sitaram Chamarty
2011-12-11 16:17 ` Gelonida N
2011-12-11 18:22 ` Jakub Narebski
2011-12-11 18:56 ` Sitaram Chamarty
2011-12-11 19:00 ` Andreas Schwab
2011-12-11 19:53 ` Jakub Narebski
2011-12-11 19:58 ` Gelonida N
2011-12-11 20:30 ` Andreas Schwab
2011-12-11 16:27 ` Martin Langhoff
2011-12-11 20:14 ` Stefan Haller
2011-12-11 20:27 ` Gelonida N
2011-12-11 20:43 ` Martin Langhoff
2011-12-11 22:22 ` Hallvard B Furuseth [this message]
2011-12-12 7:33 ` Stefan Haller
2011-12-12 8:25 ` Jeff King
2011-12-12 9:19 ` Stefan Haller
2011-12-13 19:05 ` Hallvard Breien Furuseth
2011-12-12 8:28 ` Junio C Hamano
2011-12-12 8:09 ` Junio C Hamano
2011-12-12 10:13 ` Gelonida N
2011-12-12 10:24 ` Gelonida N
2011-12-17 10:10 ` Sitaram Chamarty
2011-12-17 10:11 ` Sitaram Chamarty
2011-12-19 6:31 ` Nazri Ramliy
2012-01-18 1:50 ` Sitaram Chamarty
2012-01-18 1:48 ` Sitaram Chamarty
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=hbf.20111211x512@bombur.uio.no \
--to=h.b.furuseth@usit.uio.no \
--cc=gelonida@gmail.com \
--cc=git@vger.kernel.org \
--cc=lists@haller-berlin.de \
/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).