Re: [git-users] git-new-workdir, and updating local workdir

2015-11-19 Thread Phillip Lord
Phillip Lord writes: > Konstantin Khomoutov writes: > >> On Mon, 09 Nov 2015 17:59:13 + >> phillip.l...@newcastle.ac.uk (Phillip Lord) wrote: >> >> [...] >>> I was trying something slightly evil >>> though, which breaks this. I've been using unison to sync >>> >>> ~/src/my-repo >>> >>> bet

Re: [git-users] git-new-workdir, and updating local workdir

2015-11-10 Thread Konstantin Khomoutov
On Mon, 9 Nov 2015 22:11:04 +0100 Gergely Polonkai wrote: [...] > > In case you "kind of heard" exchanging histories between non-bare > > repos is a no-no, I can assure you that's nonsense -- while you > > obey certain simple rules. Actually, the single rule: don't try to > > push to a branch wh

Re: [git-users] git-new-workdir, and updating local workdir

2015-11-09 Thread Gergely Polonkai
On 9 Nov 2015 19:22, "Konstantin Khomoutov" wrote: > > On Mon, 09 Nov 2015 17:59:13 + > phillip.l...@newcastle.ac.uk (Phillip Lord) wrote: > > [...] > > I was trying something slightly evil > > though, which breaks this. I've been using unison to sync > > > > ~/src/my-repo > > > > between mach

Re: [git-users] git-new-workdir, and updating local workdir

2015-11-09 Thread Phillip Lord
Konstantin Khomoutov writes: > On Mon, 09 Nov 2015 17:59:13 + > phillip.l...@newcastle.ac.uk (Phillip Lord) wrote: > > [...] >> I was trying something slightly evil >> though, which breaks this. I've been using unison to sync >> >> ~/src/my-repo >> >> between machines. > [...] > > But why?

Re: [git-users] git-new-workdir, and updating local workdir

2015-11-09 Thread Konstantin Khomoutov
On Mon, 09 Nov 2015 17:59:13 + phillip.l...@newcastle.ac.uk (Phillip Lord) wrote: [...] > I was trying something slightly evil > though, which breaks this. I've been using unison to sync > > ~/src/my-repo > > between machines. [...] But why? If you have unison working between those machine

Re: [git-users] git-new-workdir, and updating local workdir

2015-11-09 Thread Phillip Lord
Paul Smith writes: > On Mon, 2015-11-09 at 10:01 +, Phillip Lord wrote: >> Now I pull to "~/src/my-repo" so it updates >> say master (or feature-branch). In ~/src/my-repo-branch/master running >> git log will show the latest commits to master, but the working >> directory will be out of date.

Re: [git-users] git-new-workdir, and updating local workdir

2015-11-09 Thread Paul Smith
On Mon, 2015-11-09 at 10:01 +, Phillip Lord wrote: > Now I pull to "~/src/my-repo" so it updates > say master (or feature-branch). In ~/src/my-repo-branch/master running > git log will show the latest commits to master, but the working > directory will be out of date. Konstantin gives you exce

Re: [git-users] git-new-workdir, and updating local workdir

2015-11-09 Thread Konstantin Khomoutov
On Mon, 9 Nov 2015 15:08:37 +0300 Konstantin Khomoutov wrote: [...] > > In ~/src/my-repo-branch/master running git log will show the latest > > commits to master, but the working directory will be out of date. > > > > Is it possible to get this workdir up to date? > > Yes, there are several. >

Re: [git-users] git-new-workdir, and updating local workdir

2015-11-09 Thread Konstantin Khomoutov
On Mon, 09 Nov 2015 10:01:56 + phillip.l...@newcastle.ac.uk (Phillip Lord) wrote: > I've been using git-new-workdir and am finding it very useful, but am > finding one problem. How do I update a working directory created with > git-new-workdir if the branch it is one is changed in the main > d

[git-users] git-new-workdir, and updating local workdir

2015-11-09 Thread Phillip Lord
I've been using git-new-workdir and am finding it very useful, but am finding one problem. How do I update a working directory created with git-new-workdir if the branch it is one is changed in the main directory. For example, say I have: ~/src/my-repo ~/src/my-repo-branch/master ~/src/my-repo