[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: EWW bugs should be fixed on emacs-25 branch
From: |
John Wiegley |
Subject: |
Re: EWW bugs should be fixed on emacs-25 branch |
Date: |
Fri, 25 Dec 2015 11:55:43 -0800 |
User-agent: |
Gnus/5.130014 (Ma Gnus v0.14) Emacs/24.5 (darwin) |
>>>>> Eli Zaretskii <address@hidden> writes:
>> 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?
That's a command since 2.6, but the concept has been there for years. I've
run into this while doing heavy-duty, daily merge work on other projects.
> How does "git cherry" enter the picture? We were talking about cherry-pick
> and merge commands.
Oops, misread when I injected that link. But it should still be relevant for
merging.
Anyway, I guess what I mean to say is: I think gitmerge.el might be trying to
do things that Git itself would handle for us.
--
John Wiegley GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com 60E1 46C4 BD1A 7AC1 4BA2
- EWW bugs should be fixed on emacs-25 branch, Eli Zaretskii, 2015/12/25
- Re: EWW bugs should be fixed on emacs-25 branch, Eli Zaretskii, 2015/12/25
- Re: EWW bugs should be fixed on emacs-25 branch, David Kastrup, 2015/12/25
- Re: EWW bugs should be fixed on emacs-25 branch, Eli Zaretskii, 2015/12/25
- Re: EWW bugs should be fixed on emacs-25 branch, John Wiegley, 2015/12/25
- Re: EWW bugs should be fixed on emacs-25 branch, Eli Zaretskii, 2015/12/25
- Re: EWW bugs should be fixed on emacs-25 branch, John Wiegley, 2015/12/25
- Re: EWW bugs should be fixed on emacs-25 branch, Eli Zaretskii, 2015/12/25
- Re: EWW bugs should be fixed on emacs-25 branch,
John Wiegley <=
- Re: EWW bugs should be fixed on emacs-25 branch, Eli Zaretskii, 2015/12/25
- Re: EWW bugs should be fixed on emacs-25 branch, John Wiegley, 2015/12/25
- Re: EWW bugs should be fixed on emacs-25 branch, Eli Zaretskii, 2015/12/25
- Re: EWW bugs should be fixed on emacs-25 branch, John Wiegley, 2015/12/25
- Re: EWW bugs should be fixed on emacs-25 branch, Eli Zaretskii, 2015/12/25
- Re: EWW bugs should be fixed on emacs-25 branch, John Wiegley, 2015/12/25
- Re: EWW bugs should be fixed on emacs-25 branch, David Engster, 2015/12/25
- Having a custom merge process (was: EWW bugs should be fixed on emacs-25 branch), John Wiegley, 2015/12/25
- Re: Having a custom merge process, Lars Ingebrigtsen, 2015/12/25
- Re: Having a custom merge process, David Engster, 2015/12/25