From: David Kastrup <dak@gnu.org>
To: emacs-devel@gnu.org
Subject: Re: "git pull -r" to avoid merge commits
Date: Sun, 01 Jun 2014 07:04:53 +0200 [thread overview]
Message-ID: <8738fpcj9m.fsf@fencepost.gnu.org> (raw)
In-Reply-To: CAHZoxq-y3k4=p+x+gpeCK3aQy7Qj6ZcNQ+AyeCREotLt=RZR+A@mail.gmail.com
Eric Hanchrow <eric.hanchrow@gmail.com> writes:
>> 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.
The length of the series is marginal. What makes a difference is
parallel ongoing work in both branches touching the same files. In that
case, disentangling the intertwined histories may be more expensive than
it is worth.
--
David Kastrup
next prev parent reply other threads:[~2014-06-01 5:04 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
2014-06-01 5:04 ` David Kastrup [this message]
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=8738fpcj9m.fsf@fencepost.gnu.org \
--to=dak@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).