From: Achim Gratz <Stromeko@nexgo.de>
To: emacs-orgmode@gnu.org
Subject: Re: Update org-mode
Date: Sat, 02 Apr 2011 22:45:11 +0200 [thread overview]
Message-ID: <8762qwl6w8.fsf@Rainer.invalid> (raw)
In-Reply-To: 4D97836C.8050309@christianmoe.com
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
next prev parent reply other threads:[~2011-04-02 20:45 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-01 15:20 Update org-mode Dror Atariah
2011-04-01 16:08 ` Ian Barton
2011-04-01 16:24 ` Jambunathan K
2011-04-05 15:31 ` Dror Atariah
2011-04-05 17:03 ` Ian Barton
2011-04-01 17:08 ` Bernt Hansen
2011-04-01 17:39 ` Nick Dokos
2011-04-01 18:14 ` Bernt Hansen
2011-04-01 17:58 ` Yagnesh Raghava Yakkala
2011-04-01 19:35 ` Dror Atariah
2011-04-01 20:03 ` Nick Dokos
2011-04-03 8:12 ` Dror Atariah
2011-04-03 8:23 ` Jambunathan K
[not found] ` <F1BFD612-B50C-4247-8261-1058352CF0E4@gmail.com>
[not found] ` <81zko7hft2.fsf@gmail.com>
2011-04-03 9:47 ` Dror Atariah
2011-04-03 11:53 ` Jambunathan K
2011-04-02 20:13 ` Christian Moe
2011-04-02 20:45 ` Achim Gratz [this message]
2011-04-02 21:02 ` Nick Dokos
2011-04-03 5:45 ` Christian Moe
2011-04-03 8:08 ` Dror Atariah
2011-04-03 9:55 ` Christian Moe
2011-04-03 10:35 ` Dror Atariah
2011-04-03 11:31 ` Achim Gratz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8762qwl6w8.fsf@Rainer.invalid \
--to=stromeko@nexgo.de \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).