ve an ugly message.
Antony
--
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 emails from it, send an email
to git-users+unsubscr...@googlegroups.com.
For more optio
This is now been resolved.
The problem was an abilguous ref, as described by the commit which fixed it
(back in 1.7.8.2): 1e7ba0f9: fetch-pack: match refs exactly (see [1] for
github).
Antony
[1]: https://github.com/git/git/commit/1e7ba0f9
--
You received this message because you are
On Saturday, 8 September 2012 16:38:22 UTC+1, Mindcast Mindcast wrote:
>
> Hello,
>
> is there any way to include empty folders when i git commit without adding
> a file (like .gitignore or .gitkeep) ?
>
> As long as i know there is no official way to do this.
>
> But, is this something it can be
ak Administ 1241889 Sep 2 17:02 libiconv-2.dll
> -rwxr-xr-x1 jak Administ 978432 Sep 2 17:02 libiconv2.dll
>
> Pretty frustrating. Any help would be greatly appreciated
> jim
>
That's a new one on me. I installed the faulty version while trying to help
someone
On 04/09/2012 18:21, Senthil wrote:
This may be an edge case which has been discussed, but I did not find any
topics relating to this.
If file 1 exists on branch B but not on branch A, I am seeing this behavior:
git checkout A
git checkout A -- 1
error: pathspec '1' did not match any file(s) know
On Thursday, 6 September 2012 08:14:47 UTC+1, Evert Tigchelaar wrote:
>
> Hi,
>
> A little while ago I had some problems with git and a colleague with more
> git
> experience helped me and performed a git rebase and now "theirs" and
> "ours" are reversed.
> I read (in the documentation) this is n
On Wednesday, 5 September 2012 07:21:14 UTC+1, Mauro Sanna wrote:
>
> On 5 September 2012 00:49, Antony Male >
> wrote:
> > On Tuesday, 4 September 2012 21:42:29 UTC+1, Mauro Sanna wrote:
> >>
> >> On 4 September 2012 14:44, Antony Male wrote:
> &g
On Tuesday, 4 September 2012 21:42:29 UTC+1, Mauro Sanna wrote:
>
> On 4 September 2012 14:44, Antony Male >
> wrote:
> > On Monday, 3 September 2012 21:53:28 UTC+1, Mauro Sanna wrote:
> >>
> >> On 3 September 2012 19:45, Antony Male wrote:
> >>
On Tuesday, 4 September 2012 20:27:00 UTC+1, Adriano Schmidt wrote:
>
> Hy,
>
> I'm using e-git (git plugin in eclipse).
>
> when I "push" happens this error:
>
> "rejected - non-fast-forward"
>
This means that the remote repo has gained new commits which aren't in your
local repo. You now can't
On Monday, 3 September 2012 21:53:28 UTC+1, Mauro Sanna wrote:
>
> On 3 September 2012 19:45, Antony Male >
> wrote:
> > On Monday, 3 September 2012 18:33:03 UTC+1, Mauro Sanna wrote:
> >>
> >> On 3 September 2012 18:56, Antony Male wrote:
> >>
On Monday, 3 September 2012 18:33:03 UTC+1, Mauro Sanna wrote:
>
> On 3 September 2012 18:56, Antony Male >
> wrote:
> > On Monday, 3 September 2012 17:32:46 UTC+1, Mauro Sanna wrote:
> >>
> >> On 3 September 2012 18:13, Antony Male wrote:
> >>
On Monday, 3 September 2012 17:32:46 UTC+1, Mauro Sanna wrote:
>
> On 3 September 2012 18:13, Antony Male >
> wrote:
> > On Monday, 3 September 2012 12:19:11 UTC+1, Mauro Sanna wrote:
> >>
> >> Then I do a git checkout master, git merge devel and push an
1.7.10, git started prompting for a commit message after every
merge. The rationale behind this is explained in Junio's (the maintainer's)
blog post [1]
Antony
[1]: http://git-blame.blogspot.co.uk/2012/02/anticipating-git-1710.html
--
You received this message because you are subscribe
ts is to download everything, this is what git
has to do.
I suspect you're cloning over a dumb transport, and this is what's causing
the effects you're seeing. Smart http(s) has been supported by git for a
long time, and, although trickier to set up on the remote side, is
defin
biguate (for example `git merge ` will be
ambiguous -- disambiguation is achieved using e.g. `git merge
refs/heads/`). However this is not the case for `git branch -d`.
Hope that makes it clearer,
Antony
--
You received this message because you are subscribed to the Google Groups "Git
for hum
; Settings\Philip\.gitconfig) as
>
> [core]
> editor = 'C:\\Program Files\\Notepad++\\notepad++.exe' -multiInst
> -notabbar -nosession -noplugin
>
If you're not confident setting this up, Github wrote a little program,
available as a .exe from [1], which s
will work fine:
First, create a new tag called at the same point as the branch
git tag
Then delete the branch called
git branch -d # You might need -D here
Hope that helps,
Antony
--
You received this message because you are subscribed to the Google Groups "Git
for human
nths, so Dropbox might have fixed their issues. However, I'd still
urge extreme caution.
Cloud storage services such as Ubuntu One appear to have this problem also.
Antony
--
You received this message because you are subscribed to the Google Groups "Git
for human beings"
file
Automatic merge failed; fix conflicts and then commit the result.
$ cat file
<<<<<<< HEAD
||| merged common ancestors
initial line 1
initial line 2
initial line 3
===
modified line 1
modified line 2
modified line 3
n
upstream by typing 'git branch -vv' -- the upstream appears in square
brackets.
So, to configure an upstream (if you don't have one set already), use
'git branch --set-upstream master origin/master', or 'git push -u origin
master' if you want to push at the
t branch -vv' -- the upstream appears in square brackets.
So, to configure an upstream (if you don't have one set already), use 'git
branch --set-upstream master origin/master', or 'git push -u origin master'
if you want to push at the same time.
Having done this, you
On Aug 13, 5:29 pm, Harry Hornreich wrote:
> Do git push --tags
git push to push a single tag, also.
Antonys
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To post to this group, send email to git-users@googlegroups.com.
To unsubsc
have set your remote url to http://localhost/git/foo.git,
> not http://localhost/foo.git. Does that help?
>
> Also check the apache error file, if it's separate.
>
> Antony
>
Also, if you want a quick response, try the main git mailing list
(g...@vger.kernel.org) or the IRC
ction of man git-http-backend, it looks like
you should have set your remote url to http://localhost/git/foo.git,
not http://localhost/foo.git. Does that help?
Also check the apache error file, if it's separate.
Antony
--
You received this message because you are subscribed to the Google G
I'm using git with SSH protocol to collaborate on our server.
My question : is-it possible to give a user the possibility to push on
a remote branch but not on others ?
Use gitolite: https://github.com/sitaramc/gitolite
Antony
--
You received this message because you are subscribed t
covers all in a
reasonable amount of depth.
Feel free to ask if you have any further questions.
Antony
[1]: http://progit.org/book/ch4-1.html
--
You received this message because you are subscribed to the Google Groups "Git for
human beings" group.
To post to this group, send em
On 11/04/2011 4:12 pm, Konstantin Khomoutov wrote:
On Mon, 11 Apr 2011 13:43:25 +0100
Antony Male wrote:
[...]
When you clone (or fetch) a repository over the git protocol, a
program on your computer (git-fetch-pack) and a similar one on the
server (git-upload-pack) coordinate to figure out
Hope this solves your problem,
Antony
[1]: http://progit.org/book/ch4-1.html#the_https_protocol
[2]: http://progit.org/book/ch4-5.html
--
You received this message because you are subscribed to the Google Groups "Git for
human beings" group.
To post to this group, send email to git-user
28 matches
Mail list logo
