From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Eli Zaretskii <eliz@gnu.org>
Cc: dak@gnu.org, emacs-devel@gnu.org
Subject: Re: Recording the date at which a change was pushed to Savannah
Date: Wed, 03 Dec 2014 16:10:30 -0500 [thread overview]
Message-ID: <jwv7fy8e9cm.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <83a9345vmt.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 03 Dec 2014 22:24:58 +0200")
>> IIRC when you do:
>>
>> git commit
>> git pull
>> <merge&commit>
>> git push
>>
>> The merge commit will put what was previously "the mainline" in the
>> "second" position, while your "git commit" will now appear as being on
>> "the mainline".
> That's why we recommend "git pull --rebase" in this case (and I
> actually pull.rebase = preserve in my .gitconfig).
There might also be a way to ask Git to generate the "merge commit" with
its two parent swapped.
> But in any case, no matter how the mainline became one, it is still
> _the_ mainline, right?
No, in the above example, the commit that was the head of the remote
branch before the "git push" (and was hence obviously on "the" mainline)
is not in "the" mainline after the "git push".
Stefan
next prev parent reply other threads:[~2014-12-03 21:10 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-02 2:55 Recording the date at which a change was pushed to Savannah Glenn Morris
2014-12-02 4:55 ` Yuri Khan
2014-12-02 5:05 ` Stephen J. Turnbull
2014-12-02 13:48 ` Stefan Monnier
2014-12-03 6:22 ` Glenn Morris
2014-12-03 6:47 ` David Kastrup
2014-12-03 7:51 ` Stephen J. Turnbull
2014-12-03 8:35 ` David Kastrup
2014-12-03 9:50 ` Stephen J. Turnbull
2014-12-03 10:04 ` David Kastrup
2014-12-03 14:18 ` Stefan Monnier
2014-12-03 16:19 ` Yuri Khan
2014-12-03 18:59 ` Stefan Monnier
2014-12-03 18:02 ` Eli Zaretskii
2014-12-03 19:00 ` Stefan Monnier
2014-12-03 19:06 ` Eli Zaretskii
2014-12-03 19:34 ` Stefan Monnier
2014-12-03 20:24 ` Eli Zaretskii
2014-12-03 21:10 ` Stefan Monnier [this message]
2014-12-04 2:52 ` Yuri Khan
2014-12-04 6:17 ` Eli Zaretskii
2014-12-04 2:58 ` Glenn Morris
2014-12-04 3:57 ` Stefan Monnier
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=jwv7fy8e9cm.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=dak@gnu.org \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.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).