all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Random832 <random832@fastmail.com>
To: emacs-devel@gnu.org
Subject: Re: Branches are Scary
Date: Fri, 18 Dec 2015 10:48:48 -0500	[thread overview]
Message-ID: <87d1u3pxjz.fsf@fastmail.com> (raw)
In-Reply-To: 838u4sxh2e.fsf@gnu.org

Eli Zaretskii <eliz@gnu.org> writes:
> So I think the too detailed history is not important for these
> branches, since they eventually are going to be deleted.  Therefore,
> my advice is just not to squash there.

If they get merged, the branch may be deleted but the history
stays forever, as part of the history graph of the branch it is
merged into.  I suppose you could squash (and rebase, so the
parent branch can be fast-forwarded) before merging, so that the
merge reflects the squashed history rather than the real history
that existed on the branch (and then never push the squashed
version to the feature branch).  Is that what you meant?

Seems... fiddly, to me.




  parent reply	other threads:[~2015-12-18 15:48 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-17 21:25 Branches are Scary Phillip Lord
2015-12-17 21:49 ` Ingo Lohmar
2015-12-17 22:20   ` Phillip Lord
2015-12-17 23:35     ` John Wiegley
2015-12-18  7:28     ` Eli Zaretskii
2015-12-18  7:49       ` Yuri Khan
2015-12-18  9:05         ` Eli Zaretskii
2015-12-18 10:43           ` Phillip Lord
2015-12-18 15:48           ` Random832 [this message]
2015-12-18 16:10             ` Eli Zaretskii
2015-12-18 16:46             ` Phillip Lord
2015-12-18  7:20 ` Eli Zaretskii

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=87d1u3pxjz.fsf@fastmail.com \
    --to=random832@fastmail.com \
    --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 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.