[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Missing changes in merges from emacs-25 to master
From: |
Eli Zaretskii |
Subject: |
Re: Missing changes in merges from emacs-25 to master |
Date: |
Tue, 22 Mar 2016 21:49:57 +0200 |
> 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.
- Re: Missing changes in merges from emacs-25 to master, (continued)
- Re: Missing changes in merges from emacs-25 to master, Stefan Monnier, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, Eli Zaretskii, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, Paul Eggert, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, Eli Zaretskii, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, Stefan Monnier, 2016/03/23
- Re: Missing changes in merges from emacs-25 to master, Stefan Monnier, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, Eli Zaretskii, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, Stefan Monnier, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, Andreas Schwab, 2016/03/23
- Re: Missing changes in merges from emacs-25 to master, Lars Magne Ingebrigtsen, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master,
Eli Zaretskii <=
- Re: Missing changes in merges from emacs-25 to master, Phillip Lord, 2016/03/27
- Re: Missing changes in merges from emacs-25 to master, Paul Eggert, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, Eli Zaretskii, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, Paul Eggert, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, Eli Zaretskii, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, Paul Eggert, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, David Engster, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, Paul Eggert, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, Eli Zaretskii, 2016/03/25
- Re: Missing changes in merges from emacs-25 to master, Andreas Schwab, 2016/03/25