From: Eric Hanchrow <eric.hanchrow@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: Thien-Thi Nguyen <ttn@gnu.org>, emacs-devel@gnu.org
Subject: Re: "git pull -r" to avoid merge commits
Date: Sat, 31 May 2014 21:14:57 -0700 [thread overview]
Message-ID: <CAHZoxq-y3k4=p+x+gpeCK3aQy7Qj6ZcNQ+AyeCREotLt=RZR+A@mail.gmail.com> (raw)
In-Reply-To: <83lhtidpyf.fsf@gnu.org>
> Why would you need to avoid merge commits? If they confuse the admin
> scripts, then perhaps fixing those scripts is a better way.
Merge commits confuse humans. If someone's contribution is just one
or two commits, then the history is much easier to understand if they
rebase instead of merging.
Merges make sense, though, when the new work is a long series of commits.
next prev parent reply other threads:[~2014-06-01 4:14 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
2014-06-01 4:14 ` Eric Hanchrow [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAHZoxq-y3k4=p+x+gpeCK3aQy7Qj6ZcNQ+AyeCREotLt=RZR+A@mail.gmail.com' \
--to=eric.hanchrow@gmail.com \
--cc=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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
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.