[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[O] Re: Update org-mode
From: |
Achim Gratz |
Subject: |
[O] Re: Update org-mode |
Date: |
Sat, 02 Apr 2011 22:45:11 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) |
Christian Moe <address@hidden> 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
- Re: [O] Re: Update org-mode, (continued)
- [O] Re: Update org-mode, Yagnesh Raghava Yakkala, 2011/04/01
- [O] Re: Update org-mode, Dror Atariah, 2011/04/01
- Re: [O] Re: Update org-mode, Nick Dokos, 2011/04/01
- Re: [O] Re: Update org-mode, Dror Atariah, 2011/04/03
- [O] Re: Update org-mode, Jambunathan K, 2011/04/03
- Message not available
- Message not available
- [O] Re: Update org-mode, Dror Atariah, 2011/04/03
- [O] Re: Update org-mode, Jambunathan K, 2011/04/03
Re: [O] Update org-mode, Christian Moe, 2011/04/02