From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Aghiles <aghilesk@gmail.com>, Jakub Narebski <jnareb@gmail.com>,
git@vger.kernel.org
Subject: Re: git pull opinion
Date: Tue, 06 Nov 2007 10:13:22 -0800 [thread overview]
Message-ID: <7v1wb3i6nx.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <Pine.LNX.4.64.0711061159240.4362@racer.site> (Johannes Schindelin's message of "Tue, 6 Nov 2007 12:02:25 +0000 (GMT)")
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> A pull is just a fetch and a merge. And a merge is a commit with more
> than one parent. So you can use the command "git reset --hard HEAD^" to
> undo a merge, just as you can undo any other commit.
*DANGER*
A pull is usually just a fetch and a merge, but sometimes it can
fast forward. ORIG_HEAD, not HEAD^, points at the previous HEAD
location in both cases.
next prev parent reply other threads:[~2007-11-06 18:13 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-05 21:52 git pull opinion Aghiles
2007-11-05 22:28 ` Jakub Narebski
2007-11-06 0:08 ` Johannes Schindelin
2007-11-06 4:22 ` Aghiles
2007-11-06 12:02 ` Johannes Schindelin
2007-11-06 18:13 ` Junio C Hamano [this message]
2007-11-06 18:28 ` Johannes Schindelin
2007-11-05 22:49 ` Alex Riesen
2007-11-05 23:33 ` Junio C Hamano
2007-11-06 0:36 ` Bill Lear
2007-11-06 0:46 ` Pierre Habouzit
2007-11-06 7:38 ` Alex Riesen
2007-11-06 8:31 ` Pierre Habouzit
2007-11-06 0:54 ` Andreas Ericsson
2007-11-06 1:16 ` Johannes Schindelin
2007-11-06 8:59 ` Andreas Ericsson
2007-11-06 12:05 ` Johannes Schindelin
2007-11-06 12:08 ` Andreas Ericsson
2007-11-06 6:30 ` Aghiles
2007-11-06 7:40 ` Alex Riesen
2007-11-06 16:36 ` Linus Torvalds
2007-11-07 21:25 ` Aghiles
2007-11-08 15:27 ` Johannes Schindelin
2007-11-10 0:36 ` Linus Torvalds
2007-11-06 0:37 ` Steven Grimm
2007-11-06 4:04 ` Aghiles
2007-11-05 23:40 ` Miklos Vajna
2007-11-06 4:16 ` Aghiles
2007-11-06 5:29 ` Benoit Sigoure
2007-11-06 7:34 ` Ralf Wildenhues
2007-11-06 11:59 ` Johannes Schindelin
2007-11-06 20:22 ` Ralf Wildenhues
2007-11-06 7:45 ` Aghiles
2007-11-06 8:51 ` Pierre Habouzit
2007-11-07 0:26 ` [PATCH] Mark 'git stash [message...]' as deprecated Brian Downing
2007-11-07 0:26 ` [PATCH] Disable implicit 'save' argument for 'git stash' Brian Downing
2007-11-07 8:00 ` [PATCH] Mark 'git stash [message...]' as deprecated Johannes Sixt
2007-11-07 8:12 ` Wincent Colaiuta
2007-11-07 8:02 ` Junio C Hamano
2007-11-07 8:23 ` Pierre Habouzit
2007-11-06 18:07 ` git pull opinion Pascal Obry
2007-11-07 7:06 ` Uwe Kleine-König
2007-11-07 7:40 ` Pascal Obry
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=7v1wb3i6nx.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=aghilesk@gmail.com \
--cc=git@vger.kernel.org \
--cc=jnareb@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 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).