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: VC mode and git Date: Tue, 31 Mar 2015 14:51:41 +0300 Message-ID: <83oan9tmeq.fsf@gnu.org> References: <86egoeusg2.fsf@example.com> <87384qzxqy.fsf@igel.home> <83bnjen71r.fsf@gnu.org> <871tk6538w.fsf@gnu.org> <838ueezgyk.fsf@gnu.org> <87vbhhpx68.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1427802745 15069 80.91.229.3 (31 Mar 2015 11:52:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 31 Mar 2015 11:52:25 +0000 (UTC) Cc: sva-news@mygooglest.com, schwab@suse.de, rms@gnu.org, monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Mike Gerwitz Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 31 13:52:17 2015 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 1YcuiH-0003q2-KR for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 13:52:09 +0200 Original-Received: from localhost ([::1]:38215 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcuiH-0006S8-3t for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 07:52:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42937) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcuiC-0006Qw-H3 for emacs-devel@gnu.org; Tue, 31 Mar 2015 07:52:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ycui7-0005W8-3G for emacs-devel@gnu.org; Tue, 31 Mar 2015 07:52:02 -0400 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:46674) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ycui6-0005Vl-RZ; Tue, 31 Mar 2015 07:51:59 -0400 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NM200900R9UXB00@a-mtaout20.012.net.il>; Tue, 31 Mar 2015 14:51:53 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NM20090CRMHQ260@a-mtaout20.012.net.il>; Tue, 31 Mar 2015 14:51:53 +0300 (IDT) In-reply-to: <87vbhhpx68.fsf@gnu.org> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.166 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:184607 Archived-At: > From: Mike Gerwitz > Cc: sva-news@mygooglest.com, schwab@suse.de, emacs-devel@gnu.org, rms@gnu.org, monnier@iro.umontreal.ca > Date: Tue, 31 Mar 2015 01:12:47 -0400 > > > We decided some time ago that we don't want to rebase, but to pull > > instead. > > It is a pull---`git pull` is simply `git fetch && git merge remote`; its > - --rebase option uses `rebase` instead of `merge`. Yes, and that's exactly what we decided to avoid, because it has bad effects if one merges from another branch and then wants to push.