From: Bernt Hansen <bernt@norang.ca>
To: Christian Egli <christian.egli@sbszh.ch>
Cc: emacs-orgmode@gnu.org
Subject: Re: [PATCH] Clean up the description of org-archive-location
Date: Tue, 02 Dec 2008 08:24:49 -0500 [thread overview]
Message-ID: <871vwqd80u.fsf@gollum.intra.norang.ca> (raw)
In-Reply-To: <j2bpvu68vp.fsf@sbszh.ch> (Christian Egli's message of "Tue\, 02 Dec 2008 13\:48\:10 +0100")
Christian Egli <christian.egli@sbszh.ch> writes:
> Hi
>
> Carsten Dominik <dominik@science.uva.nl> writes:
>
>> I think I am ripe for a little lecture about remote repositories
>> and tracking them, so that I do not need to type the location of
>> your repo each time... :-)
>
> Can't you just do
>
> git remote add bernt git://git.norang.ca/org-mode
>
> and then
>
> git fetch bernt
>
> At least that's my take if I read the section `Fetching' of
> http://www.gnome.org/~federico/news-2008-11.html#pushing-and-pulling-with-git-1.
>
Yes. (sorry I sent a reply to this off-list originally)
NOTE: The branches in my repository are temporary and rewritten for
future work after they have been included or rejected by Carsten
so you may not always find a 'for-carsten' branch in that repo.
This also means you can't track the 'for-carsten' branch locally
in your repository since it gets rewritten with rebase.
git remote add bernt git://git.norang.ca/org-mode will add a remote
named 'bernt' which you can fetch from.
When you fetch a branch using
git fetch bernt for-carsten
it creates the missing objects in your repository and points a temporary
reference FETCH_HEAD at that branch.
> Unfortunatelly there is no explanation on how to merge the Bernt's
> changes:
>
> "In the next part, we'll see how to merge Larry's changes into
> ours, and how to monitor his work to pull from it regularly."
You can view it compared to your master branch with
gitk master FETCH_HEAD
and you're free to cherry-pick commits from it. If you want to change
things you can create a branch there with
git checkout -b temp FETCH_HEAD
then you can rebase that based on other things etc.
Applying changes from my repo matches the git format-patch and git am
workflow (which is normally how one deals with patches from the mailing
list) if you do this: (this assumes no conflicts and creates linear
history)
git fetch bernt for-carsten
git checkout -b temp FETCH_HEAD
git rebase master
git checkout master
git merge temp
git branch -D temp
HTH,
Bernt
next prev parent reply other threads:[~2008-12-02 13:25 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-19 16:45 org-archive-location Matthew Lundin
2008-11-19 17:09 ` org-archive-location Nick Dokos
2008-11-19 17:22 ` [PATCH] Clean up the description of org-archive-location Bernt Hansen
2008-11-20 7:26 ` Carsten Dominik
2008-12-02 12:48 ` Christian Egli
2008-12-02 13:24 ` Bernt Hansen [this message]
2008-11-19 17:09 ` org-archive-location Bernt Hansen
2008-11-19 17:30 ` org-archive-location Matthew Lundin
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=871vwqd80u.fsf@gollum.intra.norang.ca \
--to=bernt@norang.ca \
--cc=christian.egli@sbszh.ch \
--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).