all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Nicolas Petton <nicolas@petton.fr>
To: Paul Eggert <eggert@cs.ucla.edu>, Eli Zaretskii <eliz@gnu.org>
Cc: 22506@debbugs.gnu.org
Subject: bug#22506: make change-history now doesn't work at all
Date: Mon, 01 Feb 2016 09:41:48 +0100	[thread overview]
Message-ID: <87egcwq0tv.fsf@petton.fr> (raw)
In-Reply-To: <56AEFEB1.6050109@cs.ucla.edu>

[-- Attachment #1: Type: text/plain, Size: 416 bytes --]

Paul Eggert <eggert@cs.ucla.edu> writes:

> Eli Zaretskii wrote:
>> ??? How can the commits differ, assuming Nicolas pushed his to
>> upstream?
>
> I don't know. Maybe he rebased his changes before pushing. Or maybe he did a 
> merge before pushing. I suppose it could be other things.

You are right, I did rebase one commit that happened in between in
emacs-25. That's most probably the reason!

Nico

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 512 bytes --]

  parent reply	other threads:[~2016-02-01  8:41 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-31 19:23 bug#22506: make change-history now doesn't work at all Glenn Morris
2016-01-31 20:53 ` Paul Eggert
2016-01-31 21:47   ` Nicolas Petton
2016-01-31 21:50     ` Paul Eggert
2016-02-01  3:34       ` Eli Zaretskii
2016-02-01  6:44         ` Paul Eggert
2016-02-01  7:41           ` Paul Eggert
2016-02-01  8:43             ` Nicolas Petton
2016-02-01 16:05               ` Paul Eggert
2016-02-01 17:44                 ` Nicolas Petton
2016-02-01  8:41           ` Nicolas Petton [this message]
2016-02-01  8:40         ` Nicolas Petton
2016-02-01 17:56   ` Glenn Morris

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87egcwq0tv.fsf@petton.fr \
    --to=nicolas@petton.fr \
    --cc=22506@debbugs.gnu.org \
    --cc=eggert@cs.ucla.edu \
    --cc=eliz@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.