From mboxrd@z Thu Jan  1 00:00:00 1970
From: Achim Gratz <Stromeko@nexgo.de>
Subject: Re: Update org-mode
Date: Sat, 02 Apr 2011 22:45:11 +0200
Message-ID: <8762qwl6w8.fsf@Rainer.invalid>
References: <BEBBFC33-B6D3-490B-80DD-AB839D53A4E9@gmail.com>
	<4D97836C.8050309@christianmoe.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from [140.186.70.92] (port=60551 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Q67hI-0005pE-0w
	for emacs-orgmode@gnu.org; Sat, 02 Apr 2011 16:45:29 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1Q67hG-0004r5-PL
	for emacs-orgmode@gnu.org; Sat, 02 Apr 2011 16:45:27 -0400
Received: from lo.gmane.org ([80.91.229.12]:40042)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1Q67hG-0004qz-HC
	for emacs-orgmode@gnu.org; Sat, 02 Apr 2011 16:45:26 -0400
Received: from list by lo.gmane.org with local (Exim 4.69)
	(envelope-from <geo-emacs-orgmode@m.gmane.org>) id 1Q67hD-0000gj-8g
	for emacs-orgmode@gnu.org; Sat, 02 Apr 2011 22:45:23 +0200
Received: from p57aab22c.dip.t-dialin.net ([87.170.178.44])
	by main.gmane.org with esmtp (Gmexim 0.1 (Debian))
	id 1AlnuQ-0007hv-00
	for <emacs-orgmode@gnu.org>; Sat, 02 Apr 2011 22:45:23 +0200
Received: from Stromeko by p57aab22c.dip.t-dialin.net with local (Gmexim 0.1
	(Debian)) id 1AlnuQ-0007hv-00
	for <emacs-orgmode@gnu.org>; Sat, 02 Apr 2011 22:45:23 +0200
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: emacs-orgmode@gnu.org

Christian Moe <mail@christianmoe.com> writes:
> I quickly found that git pulls would overwrite my hand-edited
> Makefile, and a hand-edited Makefile caused conflicts on the next
> pull, and I didn't understand git at all.

You could set up your own local branch to track origin/master and
preferrably using rebase instead of merge.  That will result in the
following configuration (in .git/config):

[branch "local"]
        remote = origin
        merge = refs/heads/master
        rebase = true

>From then on, you can just do "git pull" and your changes to the
Makefile will dutifully re-enacted by git.


Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

SD adaptation for Waldorf microQ V2.22R2:
http://Synth.Stromeko.net/Downloads.html#WaldorfSDada