From: Richard Copley <rcopley@gmail.com>
To: "Eli Zaretskii" <eliz@gnu.org>, "Óscar Fuentes" <ofv@wanadoo.es>
Cc: 23830@debbugs.gnu.org
Subject: bug#23830: 25.0.94; Emacs eats left Windows key on Windows 7
Date: Thu, 23 Jun 2016 12:03:44 +0100 [thread overview]
Message-ID: <CAPM58ohjoth5Hp=PR8GrxkRXA5f5YtL0d40zEW6ZzJSTbWGibQ@mail.gmail.com> (raw)
In-Reply-To: <8337o44oon.fsf@gnu.org>
Eli, sorry for replying to you personally instead of to the bug.
Eli said:
> We merge from emacs-25 to master, so commits from emacs-26 eventually
> appear on master as well.
I said:
> What still confuses me is that the other revision ab182c6 which is not on
> emacs-25 appears in the log.
The problem was that my local emacs-25 branch was pointing to master.
I had "git branch --set-upstream-to=origin $branch" in my build script.
Should have been "git branch --set-upstream-to=origin/$branch $branch".
Having fixed that the root log starts "(HEAD -> emacs-25,
origin/emacs-25)" and contains 788c9b6 but not ab182c6 which is what I
expected.
Oscar, thanks for "git branch -a --contains", noted.
next prev parent reply other threads:[~2016-06-23 11:03 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-22 18:22 bug#23830: 25.0.94; Emacs eats left Windows key on Windows 7 Richard Copley
2016-06-22 18:45 ` Eli Zaretskii
2016-06-22 19:33 ` Richard Copley
2016-06-22 21:22 ` Óscar Fuentes
2016-06-23 2:35 ` Eli Zaretskii
2016-06-23 11:03 ` Richard Copley [this message]
2016-06-23 14:34 ` Eli Zaretskii
2016-06-23 20:43 ` Richard Copley
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='CAPM58ohjoth5Hp=PR8GrxkRXA5f5YtL0d40zEW6ZzJSTbWGibQ@mail.gmail.com' \
--to=rcopley@gmail.com \
--cc=23830@debbugs.gnu.org \
--cc=eliz@gnu.org \
--cc=ofv@wanadoo.es \
/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.