|
| From: | Stefan Monnier |
| Subject: | Re: [Emacs-diffs] master f9fabb2 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs |
| Date: | Wed, 27 May 2015 22:40:41 -0400 |
| User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) |
> branch: master
> commit f9fabb2bb099d944cc97a87933b86b9eae02d067
> Merge: 570edf2 b0f3a49
> Author: Michael Albinus <address@hidden>
> Commit: Michael Albinus <address@hidden>
> Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
What happened, here?
git diff 570edf2..f9fabb2bb099d944cc97a87933b86b9eae02d067
is empty (i.e. the "merge" just threw away all the changes from
b0f3a49, i.e. from "master"). And indeed:
git diff b0f3a49..f9fabb2bb099d944cc97a87933b86b9eae02d067
shows that you reverted a bunch of the recent commits
applied to "master". How did this happen?
Stefan
| [Prev in Thread] | Current Thread | [Next in Thread] |