[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Missing changes in merges from emacs-25 to master
From: |
John Wiegley |
Subject: |
Re: Missing changes in merges from emacs-25 to master |
Date: |
Mon, 21 Mar 2016 14:27:54 -0700 |
User-agent: |
Gnus/5.130014 (Ma Gnus v0.14) Emacs/25.0.92 (darwin) |
>>>>> Eli Zaretskii <address@hidden> writes:
> Sorry, I'm not following: the above will just show the diffs between the
> branches. I asked about the reason(s) for the omission of some commits from
> the merge. How will "git diff" satisfy that request?
As for "reason for the omission", I think there are two possible answers:
1. gitmerge.el auto-marked it to be skipped, and despite my examination of
each such mark, I failed to see that should not be skipped.
2. I incorrectly resolved a merge conflict that seemed simple enough to me
that I didn't e-mail the author of the commit about it.
So, in both case, human error pointed at me. If there's a tool error here, I'd
be surprised.
--
John Wiegley GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com 60E1 46C4 BD1A 7AC1 4BA2
- Re: Missing changes in merges from emacs-25 to master, (continued)
- Re: Missing changes in merges from emacs-25 to master, Noam Postavsky, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, martin rudalics, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, Eli Zaretskii, 2016/03/21
- Re: Missing changes in merges from emacs-25 to master, John Wiegley, 2016/03/21
- Re: Missing changes in merges from emacs-25 to master, Paul Eggert, 2016/03/21
- Re: Missing changes in merges from emacs-25 to master, Eli Zaretskii, 2016/03/21
- Re: Missing changes in merges from emacs-25 to master,
John Wiegley <=
- Re: Missing changes in merges from emacs-25 to master, Paul Eggert, 2016/03/21
- Re: Missing changes in merges from emacs-25 to master, Paul Eggert, 2016/03/21
- Re: Missing changes in merges from emacs-25 to master, Eli Zaretskii, 2016/03/21
- 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, 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, 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