On Mon, Dec 26, 2011 at 19:53, Joey Hess wrote:
> To follow-up, I have added a new one, called tweak-fetch. Hopefully it
> will be accepted into git in due course
Nice; thanks.
> I already have a tweak-fetch
> branch of git-annex that can use the hook to avoid any need of manually
> running `g
Richard Hartmann wrote:
> On Thu, Dec 15, 2011 at 20:44, Richard Hartmann
> wrote:
> >> You need to run git annex merge before pushing and all will be well.
> > This seems to be a _very_ common problem for new users. I know it's a
> > message from git, not git-annex, but would there be any way t
On Thu, Dec 15, 2011 at 20:44, Richard Hartmann
wrote:
> This seems to be a _very_ common problem for new users. I know it's a
> message from git, not git-annex, but would there be any way to display
> a hint?
As a follow-up, there are no hooks that could be used. Pity.
Richard
___
On Thu, Dec 15, 2011 at 18:19, Joey Hess wrote:
> You need to run git annex merge before pushing and all will be well.
This seems to be a _very_ common problem for new users. I know it's a
message from git, not git-annex, but would there be any way to display
a hint?
Richard
__
David Edmondson wrote:
> Set the default upstream:
>
> laptop$ git branch master --set-upstream origin/master
> fatal: Not a valid object name: 'origin/master'.
> laptop$
>
> This fatal error seems to be the source of the later problems.
I've never needed to use --set-upstre
I'd like to configure a centralised bare repository in which I can store
a master copy of content. A couple of other systems will clone and
push/pull changes. I don't seem to be able to get things to work as I
would expect, which most likely means that I'm mis-understanding and
doing things incorre
