From: Clemens Buchacher <drizzd@aon.at>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: Jonathan Nieder <jrnieder@gmail.com>, git@vger.kernel.org
Subject: Re: Useful tracking branches and auto merging
Date: Sun, 10 Oct 2010 19:15:05 +0200 [thread overview]
Message-ID: <20101010171505.GA15495@localhost> (raw)
In-Reply-To: <AANLkTikkXdDepdeOY4MZvgfCEgX69Tx6d0-QS-g3bWK-@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 313 bytes --]
On Mon, Oct 04, 2010 at 11:56:02PM +0300, Felipe Contreras wrote:
>
> Moreover, wouldn't it make sense to make 'git merge' = 'git merge
> @{u}'?
Isn't that what 'git pull' does? Especially after using 'git
fetch'?
I prefer 'git merge' as one of the few git commands without magic
behavior and DWIMery.
Clemens
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
next prev parent reply other threads:[~2010-10-10 17:15 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
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 [this message]
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=20101010171505.GA15495@localhost \
--to=drizzd@aon.at \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
/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.