From: Eli Zaretskii <eliz@gnu.org>
To: Andreas Schwab <schwab@linux-m68k.org>
Cc: acm@muc.de, i.lohmar@gmail.com, emacs-devel@gnu.org,
kaushal.modi@gmail.com
Subject: Re: Understanding a recent commit in emacs-25 branch [ed19f2]
Date: Sun, 03 Apr 2016 21:04:00 +0300 [thread overview]
Message-ID: <83r3empo1b.fsf@gnu.org> (raw)
In-Reply-To: <871t6mzjc3.fsf@linux-m68k.org> (message from Andreas Schwab on Sun, 03 Apr 2016 19:35:24 +0200)
> From: Andreas Schwab <schwab@linux-m68k.org>
> Cc: i.lohmar@gmail.com, acm@muc.de, kaushal.modi@gmail.com, emacs-devel@gnu.org
> Date: Sun, 03 Apr 2016 19:35:24 +0200
>
> Eli Zaretskii <eliz@gnu.org> writes:
>
> >> From: Andreas Schwab <schwab@linux-m68k.org>
> >> Cc: Ingo Lohmar <i.lohmar@gmail.com>, acm@muc.de, kaushal.modi@gmail.com, emacs-devel@gnu.org
> >> Date: Sun, 03 Apr 2016 18:24:33 +0200
> >>
> >> Eli Zaretskii <eliz@gnu.org> writes:
> >>
> >> > But we were talking about "git pull", not about merge.
> >>
> >> pull == fetch+merge.
> >
> > But "git help pull" != "git help fetch"+"git help merge".
>
> What's your point? pull has additional options.
My point is that we were talking about "git pull", and therefore the
relevant documentation is the man page of "pull", not of "merge". The
man page of "pull" no longer warns about pulling when there are
uncommitted changes.
next prev parent reply other threads:[~2016-04-03 18:04 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-01 5:32 Understanding a recent commit in emacs-25 branch [ed19f2] Kaushal Modi
2016-04-01 5:43 ` Kaushal Modi
2016-04-01 6:43 ` Paul Eggert
2016-04-03 12:03 ` Alan Mackenzie
2016-04-03 12:10 ` Achim Gratz
2016-04-03 14:18 ` Stefan Monnier
2016-04-03 14:49 ` Óscar Fuentes
2016-04-03 18:15 ` Achim Gratz
2016-04-03 18:45 ` Andreas Schwab
2016-04-03 18:56 ` Eli Zaretskii
2016-04-03 20:02 ` Paul Eggert
2016-04-03 21:15 ` Andreas Schwab
2016-04-03 23:11 ` John Wiegley
2016-04-03 12:18 ` Ingo Lohmar
2016-04-03 11:17 ` Alan Mackenzie
2016-04-03 11:27 ` Andreas Schwab
2016-04-03 11:40 ` Ingo Lohmar
2016-04-03 12:14 ` Alan Mackenzie
2016-04-03 12:30 ` Ingo Lohmar
2016-04-03 14:12 ` Andreas Schwab
2016-04-03 14:57 ` Ingo Lohmar
2016-04-03 15:08 ` Andreas Schwab
2016-04-03 15:12 ` Eli Zaretskii
2016-04-03 15:01 ` Eli Zaretskii
2016-04-03 15:23 ` Ingo Lohmar
2016-04-03 15:40 ` Eli Zaretskii
2016-04-03 16:00 ` Ingo Lohmar
2016-04-03 16:19 ` Eli Zaretskii
2016-04-03 16:24 ` Andreas Schwab
2016-04-03 17:09 ` Eli Zaretskii
2016-04-03 17:35 ` Andreas Schwab
2016-04-03 18:04 ` Eli Zaretskii [this message]
2016-04-03 11:44 ` Dmitry Gutov
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83r3empo1b.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=acm@muc.de \
--cc=emacs-devel@gnu.org \
--cc=i.lohmar@gmail.com \
--cc=kaushal.modi@gmail.com \
--cc=schwab@linux-m68k.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.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).