[git-users] GIT-SVN: Corrupted commits when using --preserve-empty-dirs

2012-09-04 Thread Mark Plomer
Hi, if I clone a SVN repository with --preserve-empty-dirs it terminates at some point with i.e. following error: folder/subfolder was not found in commit 2dcb008c220f5f6fe33700c9e7deb0c8fa2b8607 (r4) I tracked things down to the following problem: - r1: Create a directory with subdirectory with

[git-users] Re: GIT-SVN: Corrupted commits when using --preserve-empty-dirs

2012-09-04 Thread Thomas Ferris Nicolaisen
On Tuesday, September 4, 2012 11:37:00 AM UTC+2, Mark Plomer wrote: > > Hi, > if I clone a SVN repository with --preserve-empty-dirs it terminates at > some point with i.e. following error: > folder/subfolder was not found in commit > 2dcb008c220f5f6fe33700c9e7deb0c8fa2b8607 (r4) > > I tracked th

Re: [git-users] Re: Why git merge always ask for a commit message?

2012-09-04 Thread Antony Male
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 17:32:46 UTC+1, Ma

[git-users] Re: GIT-SVN: Corrupted commits when using --preserve-empty-dirs

2012-09-04 Thread Mark Plomer
OK done ... for the Archive: http://marc.info/?l=git&m=134676432118078 -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/VzJqsZ_Ngc0J. To post to this gr

[git-users] git checkout " silently fails

2012-09-04 Thread Senthil
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) known to git. git checkout B git checkout

[git-users] rejected - non-fast-forward

2012-09-04 Thread Adriano Schmidt
Hy, I'm using e-git (git plugin in eclipse). when I "push" happens this error: "rejected - non-fast-forward" What can I do? Thanks! Adriano Schmidt www.localhost8080.com.br -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To view thi

Re: [git-users] git checkout " silently fails

2012-09-04 Thread Philip Oakley
If both cases of checking out a path you are expected to provide a , not a . The git glossary says that a tree-ish is a commit, tree, or tag - nothing about a branch. The corner case is probably hidden inside that aspect of the wording. If you can think of a succinct phrase that would clarify

[git-users] Help! Unable to retrieve my stashed files!

2012-09-04 Thread kramer.newsreader
First, let me preface this post by saying that yes I am new to git and that it has by far the steepest learning curve of any source control system I have used. My question is a two parter. 1) I am working in a slightly different environment than my colleagues and need changes to the source in

[git-users] Re: rejected - non-fast-forward

2012-09-04 Thread Antony Male
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

Re: [git-users] Re: Why git merge always ask for a commit message?

2012-09-04 Thread Mauro
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 Monday, 3 September 2012 18:33:03 UTC+1, Mauro Sanna wrote: >> >> >> >> On 3 September 2012 18:56, Antony Male wrote: >> >> >

[git-users] subdirectory-filter while preserving *all* history

2012-09-04 Thread EvanED
I have a repository containing some files which have undergone some arbitrary copies/movies in the past, such that you need 'git log --follow' to view all the relevant history for those files. I'd like to use something like 'git filter-branch --subdirectory-filter ...' to extract a parent direc

Re: [git-users] rejected - non-fast-forward

2012-09-04 Thread Konstantin Khomoutov
On Tue, Sep 04, 2012 at 12:27:00PM -0700, Adriano Schmidt wrote: > I'm using e-git (git plugin in eclipse). > > when I "push" happens this error: > > "rejected - non-fast-forward" > > What can I do? You should read The Book: http://git-scm.com/book/en/Distributed-Git-Contributing-to-a-Project#

Re: [git-users] Re: Why git merge always ask for a commit message?

2012-09-04 Thread Antony Male
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 Monday, 3 September 2012 18:33:03 UTC+1, M

Re: [git-users] Help! Unable to retrieve my stashed files!

2012-09-04 Thread Konstantin Khomoutov
On Tue, Sep 04, 2012 at 01:22:47PM -0700, kramer.newsreader wrote: > First, let me preface this post by saying that yes I am new to git and that > it has by far the steepest learning curve of any source control system I > have used. I think you could have omitted this remark without any loss fo

[git-users] How to "sync/update" from a remote repositry with an older locally stored repository

2012-09-04 Thread wkelhwlieope
Hi Git-gui version: 0.15.GIT GUI git version: 1.7.11.mysysgit.0 Platform: Windows 7 New to Git I have created a project on GitHub (https://github.com) on which I succesfully created a repository and could check in my changes from this Computer (A) Then I moved to another computer (B) an

Re: [git-users] Re: Why git merge always ask for a commit message?

2012-09-04 Thread Mauro
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: >> > On Monday, 3 September 2012 21:53:28 UTC+1, Mauro Sanna wrote: >> >> >> >> On 3 September 2012 19:45, Antony Male wrote: >> >>