From: Jonathan Nieder <jrnieder@gmail.com>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Useful tracking branches and auto merging
Date: Mon, 4 Oct 2010 15:46:25 -0500 [thread overview]
Message-ID: <20101004204625.GH6466@burratino> (raw)
In-Reply-To: <AANLkTimq0sKUavKiXepDOz+DvrymuRAVUyAyV+FzbCBD@mail.gmail.com>
Felipe Contreras wrote:
> Your branch is behind 'origin/master' by 17 commits, and can be fast-forwarded.
>
> This message doesn't tell me _how_ I can 'fast-forward', I do 'git
> merge origin/master' but if git already knows 'master' is tracking
> 'origin/master' why should I specify that? Perhaps 'git merge
> --tracking'.
git merge @{u}
> But, while we are on that, why not automatically merge the tracking
> branches?
Maybe 'git pull --all' could be taught to eventually do this? That
would be incompatible with its current behavior of fetching everything
and merging some random branch, but I don't think anyone is relying
on that.
next prev parent reply other threads:[~2010-10-04 20:50 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-04 20:44 Useful tracking branches and auto merging Felipe Contreras
2010-10-04 20:46 ` Jonathan Nieder [this message]
2010-10-04 20:56 ` Felipe Contreras
2010-10-04 20:57 ` Jonathan Nieder
2010-10-04 21:06 ` Felipe Contreras
2010-10-10 17:15 ` Clemens Buchacher
2010-10-10 17:30 ` Felipe Contreras
2010-10-10 17:45 ` Clemens Buchacher
2010-10-10 17:48 ` Felipe Contreras
2010-10-05 16:35 ` Junio C Hamano
2010-10-05 17:49 ` Felipe Contreras
2010-10-05 20:10 ` Junio C Hamano
2010-10-07 10:04 ` Felipe Contreras
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=20101004204625.GH6466@burratino \
--to=jrnieder@gmail.com \
--cc=felipe.contreras@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.