From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Achim Gratz Newsgroups: gmane.emacs.devel Subject: Re: Git transition workflow Date: Tue, 12 Aug 2014 21:13:40 +0200 Organization: Linux Private Site Message-ID: <87lhqtv7vf.fsf@Rainer.invalid> References: <2720487.3bKIskrhp0@descartes> <87sil214zs.fsf@drakenvlieg.flower> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1407870871 398 80.91.229.3 (12 Aug 2014 19:14:31 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 12 Aug 2014 19:14:31 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Aug 12 21:14:25 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 1XHHWb-0000CN-4U for ged-emacs-devel@m.gmane.org; Tue, 12 Aug 2014 21:14:25 +0200 Original-Received: from localhost ([::1]:43731 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHHWa-00051T-DP for ged-emacs-devel@m.gmane.org; Tue, 12 Aug 2014 15:14:24 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33614) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHHWE-0004ga-GD for emacs-devel@gnu.org; Tue, 12 Aug 2014 15:14:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XHHW8-0005Ko-4c for emacs-devel@gnu.org; Tue, 12 Aug 2014 15:14:02 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:37050) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHHW7-0005Kc-UE for emacs-devel@gnu.org; Tue, 12 Aug 2014 15:13:56 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1XHHW4-0008OB-EC for emacs-devel@gnu.org; Tue, 12 Aug 2014 21:13:52 +0200 Original-Received: from pd9eb3937.dip0.t-ipconnect.de ([217.235.57.55]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 12 Aug 2014 21:13:52 +0200 Original-Received: from Stromeko by pd9eb3937.dip0.t-ipconnect.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 12 Aug 2014 21:13:52 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 23 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: pd9eb3937.dip0.t-ipconnect.de User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.91 (gnu/linux) Cancel-Lock: sha1:cd3AO3o69UGSdUDfHoobMjQQ7Ag= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:173605 Archived-At: Jan Nieuwenhuizen writes: > Daily work > If you’re using the command-line: > > git pull > > May I suggest to change this to > > git pull --rebase / git pull -r > > or we're going to see a whole lot of merge commits. If you have local branches you _want_ to rebase, then it is generally much more useful to set them "rebase=true" in the Git config. Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ Wavetables for the Terratec KOMPLEXER: http://Synth.Stromeko.net/Downloads.html#KomplexerWaves