From: Eli Zaretskii <eliz@gnu.org>
To: Thien-Thi Nguyen <ttn@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: "git pull -r" to avoid merge commits
Date: Sat, 31 May 2014 16:42:48 +0300 [thread overview]
Message-ID: <83lhtidpyf.fsf@gnu.org> (raw)
In-Reply-To: <87a99yqe0d.fsf@zigzag.favinet>
> From: Thien-Thi Nguyen <ttn@gnu.org>
> Date: Sat, 31 May 2014 15:22:26 +0200
>
> In the ELPA repo, i see "Merge branch 'master' of git+ssh://...",
> which are merge commits IIUC. I suspect this event confused the
> admin scripts and so prevented the (recently released) xpm 1.0.2
> From auto-generating a post to info-gnu-emacs. Is that correct?
>
> On the contributor side, i regularly use "git pull -r" because i
> believe doing so avoids creating merge commits. (This is based
> on git-push(1) section "NOTE ABOUT FAST-FORWARDS", primarily.)
> Am i missing something? Is there a better way to avoid merge
> commits?
Why would you need to avoid merge commits? If they confuse the admin
scripts, then perhaps fixing those scripts is a better way.
next prev parent reply other threads:[~2014-05-31 13:42 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-31 13:22 "git pull -r" to avoid merge commits Thien-Thi Nguyen
2014-05-31 13:42 ` Eli Zaretskii [this message]
2014-06-01 4:14 ` Eric Hanchrow
2014-06-01 5:04 ` David Kastrup
2014-06-01 5:57 ` Thien-Thi Nguyen
2014-05-31 13:54 ` David Kastrup
2014-05-31 14:29 ` 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=83lhtidpyf.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=ttn@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).