From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: merging emacs-24 Date: Thu, 27 Nov 2014 18:23:20 +0200 Message-ID: <83egsoobnr.fsf@gnu.org> References: <87a93eavwt.fsf@lifelogs.com> <87wq6hap7v.fsf@lifelogs.com> <87y4qx76hh.fsf@lifelogs.com> <87r3wpmmf6.fsf@wanadoo.es> <87oart74q5.fsf@lifelogs.com> <61sih5uww3.fsf@fencepost.gnu.org> <878uiw7q5n.fsf@lifelogs.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1417105411 19026 80.91.229.3 (27 Nov 2014 16:23:31 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 27 Nov 2014 16:23:31 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 27 17:23:23 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Xu1qk-000574-Nc for ged-emacs-devel@m.gmane.org; Thu, 27 Nov 2014 17:23:22 +0100 Original-Received: from localhost ([::1]:40443 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu1qk-000739-8f for ged-emacs-devel@m.gmane.org; Thu, 27 Nov 2014 11:23:22 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44729) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu1qZ-0006xB-Uq for emacs-devel@gnu.org; Thu, 27 Nov 2014 11:23:17 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xu1qR-0004fs-SP for emacs-devel@gnu.org; Thu, 27 Nov 2014 11:23:11 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:37534) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu1qR-0004fa-JQ for emacs-devel@gnu.org; Thu, 27 Nov 2014 11:23:03 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NFP00E00HIEUT00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Thu, 27 Nov 2014 18:23:02 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NFP00EJJHIDK730@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Thu, 27 Nov 2014 18:23:02 +0200 (IST) In-reply-to: <878uiw7q5n.fsf@lifelogs.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:178360 Archived-At: > From: Ted Zlatanov > Date: Thu, 27 Nov 2014 08:02:12 -0500 > > GM> BTW: with bzr, the logs for the merged changes would be visible with > > GM> bzr log -n0 > > GM> How does one do that with git log? > > You do it to the two branches that were merged. So e.g. > > commit ba4502fe1465f7803beca3ae187e41f0b25bef10 > Merge: b121ef1 81e0cca > Author: Ted Zlatanov > Date: Wed Nov 26 21:31:11 2014 -0500 > > Merge branch 'emacs-24' > > means you do `git log b121ef1..81e0cca' AFAIU, this only shows the merge-commits, but doesn't otherwise identify the commits that were done on another branch.