[Top][All Lists]

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

Re: EWW bugs should be fixed on emacs-25 branch

From: Eli Zaretskii
Subject: Re: EWW bugs should be fixed on emacs-25 branch
Date: Fri, 25 Dec 2015 21:41:08 +0200

> From: John Wiegley <address@hidden>
> Cc: address@hidden,  address@hidden,  address@hidden
> Date: Fri, 25 Dec 2015 09:23:44 -0800
> > AFAIK, Git doesn't track cherry-picks in the DAG.
> What it does track are "patch ids", that is, the SHA of the diff represented
> by a given commit against its parent:
>     https://www.kernel.org/pub/software/scm/git/docs/git-patch-id.html
> This allows the merging algorithm to know whether it's attempting to bring in
> a change that has already been seen on the target branch.

Since what Git version?

>   "git cherry can compare a branch with its upstream branch and find which
>   commits have been upstreamed and which haven’t. This command is particularly
>   clever because, thanks to git patch-id, it can correctly spot when a commit
>   has been upstreamed, even when the upstreaming process resulted in changes
>   to the commit message, line numbers, or whitespace."
>     (from http://blog.adamspiers.org/2013/09/19/easier-upstreaming-with-git/)

How does "git cherry" enter the picture?  We were talking about
cherry-pick and merge commands.

reply via email to

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