all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: Andreas Schwab <schwab@linux-m68k.org>
Cc: emacs-devel@gnu.org
Subject: Re: merging emacs-24
Date: Fri, 28 Nov 2014 10:54:07 +0200	[thread overview]
Message-ID: <83fvd3n1sg.fsf@gnu.org> (raw)
In-Reply-To: <87ppc7g1w4.fsf@igel.home>

> From: Andreas Schwab <schwab@linux-m68k.org>
> Cc: emacs-devel@gnu.org
> Date: Fri, 28 Nov 2014 09:33:47 +0100
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> 
> >> From: Andreas Schwab <schwab@linux-m68k.org>
> >> Cc: emacs-devel@gnu.org
> >> Date: Thu, 27 Nov 2014 18:56:15 +0100
> >> 
> >> Eli Zaretskii <eliz@gnu.org> writes:
> >> 
> >> > If that's not true, how do I tell which commits in the linear list
> >> > shown by "git log" were made on master, and which were committed to
> >> > emacs-24 and later merged?
> >> 
> >> By looking from which branch they are reachable.
> >
> > How do I do that?
> 
> If "git merge-base A B" outputs (the SHA1 of) B then you know that B is
> reachable by A.  Another way to visualize this is to use "git
> show-branch A B".

Yes, OK.  Thanks.  I think "git log --graph" and "C-x v L" are also
fine.

My point was that just "git log" does not provide that info, although
(unlike bzr) it does by default show the commits from merged branches.



  reply	other threads:[~2014-11-28  8:54 UTC|newest]

Thread overview: 64+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-17  4:04 bug#19074: 24.4; Bug in auth-source.el's search of OS X Keychain John Mastro
2014-11-17  5:38 ` bug#19074: " John Mastro
2014-11-26 14:17   ` Ted Zlatanov
2014-11-26 15:57     ` Stefan Monnier
     [not found]       ` <87wq6hap7v.fsf@lifelogs.com>
2014-11-26 18:59         ` merging emacs-24 (was: bug#19074: Bug in auth-source.el's search of OS X Keychain) Stefan Monnier
2014-11-26 19:02           ` merging emacs-24 David Engster
2014-11-26 20:01             ` Ted Zlatanov
2014-11-26 22:16             ` Stefan Monnier
2014-11-27 17:27               ` David Engster
2014-11-27 17:55                 ` Eli Zaretskii
2014-11-27 18:31                   ` Andreas Schwab
2014-11-27 18:42                     ` Eli Zaretskii
2014-11-27 18:46                       ` David Engster
2014-11-27 18:55                         ` Eli Zaretskii
2014-11-27 19:21                           ` David Engster
2014-11-27 21:05                         ` Stefan Monnier
2014-11-27 22:24                           ` David Engster
2014-11-28  0:28                             ` Ted Zlatanov
2014-11-28  8:20                               ` Eli Zaretskii
2014-11-28 14:20                                 ` Michael Welsh Duggan
2014-11-28 14:59                                   ` Eli Zaretskii
2014-11-28 15:06                                     ` Michael Welsh Duggan
2014-11-28 14:37                                 ` David Kastrup
2014-11-28 15:14                                   ` Eli Zaretskii
2014-11-29 12:55                             ` Eli Zaretskii
2014-11-29 20:01                               ` Glenn Morris
2014-11-29 20:33                                 ` Eli Zaretskii
2014-11-27  1:54           ` Ted Zlatanov
2014-11-27  2:01             ` Óscar Fuentes
2014-11-27  2:32               ` Ted Zlatanov
2014-11-27  3:48                 ` Glenn Morris
2014-11-27  3:59                   ` Glenn Morris
2014-11-27 10:45                     ` Andreas Schwab
2014-11-27 13:02                   ` Ted Zlatanov
2014-11-27 16:23                     ` Eli Zaretskii
2014-11-27 17:11                       ` Andreas Schwab
2014-11-27 17:44                         ` Eli Zaretskii
2014-11-27 17:56                           ` Andreas Schwab
2014-11-27 18:04                             ` Eli Zaretskii
2014-11-28  8:33                               ` Andreas Schwab
2014-11-28  8:54                                 ` Eli Zaretskii [this message]
2014-11-28 15:44                                   ` Sergey Organov
2014-11-28 15:56                                     ` David Kastrup
2014-11-27 17:17                     ` Stefan Monnier
2014-11-27 17:32                     ` David Engster
2014-11-27 17:59                       ` Andreas Schwab
2014-11-28  0:30                       ` Ted Zlatanov
2014-11-28  2:55                       ` Stephen J. Turnbull
2014-11-28  3:29                         ` Stephen J. Turnbull
2014-11-28  8:27                           ` Eli Zaretskii
2014-11-28  0:31                     ` Ted Zlatanov
2014-11-29  7:20                       ` Paul Eggert
2014-11-29 21:27                         ` Glenn Morris
2014-11-29 22:28                           ` generating Chan(was: merging emacs-24) Paul Eggert
2014-11-28  0:33                     ` merging emacs-24 Ted Zlatanov
2014-11-28  8:22                       ` Andreas Schwab
2014-11-28  8:31                       ` Eli Zaretskii
2014-11-28 14:29                         ` Stefan Monnier
2014-11-29 20:02                           ` Glenn Morris
2014-11-27 16:10                   ` Eli Zaretskii
2014-11-29 20:13                     ` Glenn Morris
2014-11-26 22:30     ` bug#19074: Bug in auth-source.el's search of OS X Keychain Katsumi Yamaoka
2014-11-27  1:24       ` Ted Zlatanov
  -- strict thread matches above, loose matches on Subject: below --
2015-02-25 21:17 merging emacs-24 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=83fvd3n1sg.fsf@gnu.org \
    --to=eliz@gnu.org \
    --cc=emacs-devel@gnu.org \
    --cc=schwab@linux-m68k.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.