From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Junio C Hamano <gitster@pobox.com>
Cc: Aghiles <aghilesk@gmail.com>, Jeff King <peff@peff.net>,
Nicolas Sebrecht <nicolas.s.dev@gmx.fr>,
Thomas Rast <trast@student.ethz.ch>,
git list <git@vger.kernel.org>
Subject: Re: git pull suggestion
Date: Sun, 11 Apr 2010 18:33:22 +0200 [thread overview]
Message-ID: <vpq4ojit0dp.fsf@bauges.imag.fr> (raw)
In-Reply-To: <7vaataphi7.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Sun\, 11 Apr 2010 00\:37\:04 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> git does _not_ implement a handy Porcelain to do this, but we could script
> it like this (I am only illustrating that it can be done, but I am leaving
> the reason why git chooses not to to a later part of this message).
Actually, another way to do this is
git commit -a
git rebase origin/where-you-want-to-merge-from
git reset HEAD^
That would not necessarily be a good way to implement a command, but I
often use variants of this interactively.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2010-04-11 16:37 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-07 23:17 git pull suggestion Aghiles
2010-04-08 15:54 ` Thomas Rast
2010-04-08 19:33 ` Aghiles
2010-04-08 23:11 ` Nicolas Sebrecht
2010-04-09 3:06 ` Aghiles
2010-04-09 3:49 ` Jeff King
2010-04-09 19:33 ` Aghiles
2010-04-10 4:35 ` Jeff King
2010-04-10 4:40 ` Junio C Hamano
2010-04-11 6:01 ` Aghiles
2010-04-11 7:37 ` Junio C Hamano
2010-04-11 16:33 ` Matthieu Moy [this message]
2010-04-12 20:18 ` Aghiles
2010-04-12 21:35 ` Junio C Hamano
2010-04-09 20:54 ` Aghiles
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=vpq4ojit0dp.fsf@bauges.imag.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=aghilesk@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=nicolas.s.dev@gmx.fr \
--cc=peff@peff.net \
--cc=trast@student.ethz.ch \
/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.