emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Is it time to drop ChangeLogs?


From: Yuri Khan
Subject: Re: Is it time to drop ChangeLogs?
Date: Sun, 13 Mar 2016 23:42:29 +0600

On Sun, Mar 13, 2016 at 11:30 PM, Eli Zaretskii <address@hidden> wrote:

>> > No, I mean the messages corrected in commits by others.
>>
>> Commits by others do not typically occur on branches which are
>> socially accepted as rebasable. The only case I can think of is when
>> you cherry-pick someone’s commit into your feature branch while that
>> commit had been corrected. Is that the case you have in mind?
>
> No, I mean "git pull --rebase" and its variants.  AFAIK, there's
> nothing anti-social in such a workflow, when you have local unpushed
> commits that you intend to push later.

If you do a git pull --rebase, then your branch now starts after the
other’s commit. I assume any corrections that apply to that commit on
master (or whatever other development branch it is on), also apply to
that same commit as seen from your feature branch.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]