05, 2014 6:17 PM
Subject: Re: [git-users] File in master messed up after adding someone's topic
You are completely right. Fortunately for me, I only want to keep up with the
changes, so I only need to pull , not push. So my initial
git pull --depth 1 was fine. Worked for years. It was
You are completely right. Fortunately for me, I only want to keep up with
the changes, so I only need to pull , not push. So my initial
git pull --depth 1 was fine. Worked for years. It was only when I
got involved in a sub-project that I added another users' topic, *without
having enough backg
e to 'next'.
"
Hope that helps
Philip
- Original Message -
From: nmac...@iburst.co.za
To: git-users@googlegroups.com
Cc: nmac...@iburst.co.za ; Philip Oakley
Sent: Sunday, January 05, 2014 2:59 AM
Subject: Re: [git-users] File in master messed up after add
Fixed my origin value and then did reset --hard origin.master and
everything works now.
This thread has been added to Favourites.
Much obliged for all the help.
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this gr
Sorry, just checked a few things.
Git does know about origin, git remote -v shows origin
g...@gitorious.org/fg/fgdata.git (fetch and push)
However, the response to git reset --hard origin/master is
Ambiguous argument 'origin/master'; unknown revision or path not in the
working tree
--
You recei
A couple of points:
1) Because of bandwidth constraints at the time, I didn't do a clone, I did
a shallow pull when I started. Not important at the time as I only do pulls.
2) So my system is unaware of origin.
3) The branch is master,
4) In another folder I work with a different repository.
5) Is
/docs/git-reset.html
Philip
- Original Message -
From: nmac...@iburst.co.za
To: git-users@googlegroups.com
Cc: nmac...@iburst.co.za ; Philip Oakley
Sent: Saturday, January 04, 2014 2:38 AM
Subject: Re: [git-users] File in master messed up after adding someone's topic
Just a bit more info. If I do a
git fetch
and then
git diff --
I get no difference. But git still says I have unmerged changes.
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving
> - Original Message -
>
> *From:* nma...@iburst.co.za
> *To:* git-...@googlegroups.com
> *Sent:* Thursday, January 02, 2014 4:42 AM
> *Subject:* [git-users] File in master messed up after adding someone's
> topic
>
> I just use git to keep up with bleedin
ch have diverged. You won't need to download 5Gb! You should already
have all the data you need.
Philip
- Original Message -
From: nmac...@iburst.co.za
To: git-users@googlegroups.com
Sent: Thursday, January 02, 2014 4:42 AM
Subject: [git-users] File in master messed u
I just use git to keep up with bleeding edge changes to a project. Don't
edit/commit or anything.
Added someone's topic to get their files for review.
Then removed the topic.
However, one file in master was changed by adding the topic. (I didn't
touch it.)
Now I can no longer do a pull because it
11 matches
Mail list logo
