[Orgmode] Re: [PATCH] Clean up the description of org-archive-location

[Bernt Hansen]

Christian Egli <address@hidden> writes:

> Hi
>
> Carsten Dominik <address@hidden> 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