Re: Missing changes in merges from emacs-25 to master

[Eli Zaretskii]

> From: Lars Magne Ingebrigtsen <address@hidden>
> Cc: Stefan Monnier <address@hidden>,  address@hidden
> Date: Tue, 22 Mar 2016 20:34:52 +0100
> 
> Eli Zaretskii <address@hidden> writes:
> 
> > We've been through this: "git rebase" will cause much worse trouble if
> > you have local merge-commits from feature branches. 
> 
> That's true, but that's a quite unusual thing to be doing.  ("Unusual"
> as in "most of the time most of the people who work on Emacs won't be
> doing that".)

I was explaining why _I_ don't want to use rebase when pulling from
upstream.  To understand that, you need to ask what _I_ do most of the
time, not what others do.

For me, working on a feature branch is entirely not unusual.