Re: [git-users] Why Same Files show up with different Statuses in Git?

2013-02-01 Thread Blind
default is true. make $ git config core.filemode false and then try again 31 януари 2013, четвъртък, 21:31:28 UTC+2, Matthew Johnson написа: git config --list does not show core.filemode at all. Nor does git config --get core.filemode (both in Cygwin/windows). So what does it default to?

[git-users] Moving from local svn to git

2013-02-01 Thread Rainer M Krug
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi I want to move from svn to git and clone my repositories for this. My problem: I have no idea how I can clone a *local* svn repository. I found that git svn clone THEREPO --stdlayout should work, but I can't figure out what to use as THEREPO.

[git-users] Re: Moving from local svn to git

2013-02-01 Thread Alex Lewis
I think you *might* be missing a / the beginning of your URL after the file:// part? So it should be file:// like http://;, etc. but then */*home/krug/... so you have file://*/*home/krug/.. HTH On Friday, 1 February 2013 09:45:43 UTC, Rainer M Krug wrote: -BEGIN PGP SIGNED MESSAGE-

[git-users] Please explain the Merge: sha sha line in fast forward merge

2013-02-01 Thread rridpath
I would like to understand what the Merge: line is telling me in the output of a git log showing a fast forward merge. For commit 8aa6f4fa below I can see the two SHA's listed there right below it. I just don't really understand what that line is saying. From what I've read around Fast Forward

[git-users] Re: Moving from local svn to git

2013-02-01 Thread Rainer M Krug
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 01/02/13 11:12, Alex Lewis wrote: I think you /might/ be missing a / the beginning of your URL after the file:// part? So it should be file:// like http://;, etc. but then */*home/krug/... so you have file://*/*home/krug/.. Great - that

Re: [git-users] Re: Moving from local svn to git

2013-02-01 Thread Konstantin Khomoutov
On Fri, 01 Feb 2013 11:54:39 +0100 Rainer M Krug r.m.k...@gmail.com wrote: [...] I now did git svn clone file:///home/rkrug/svn/Documents/Publications/2010/Paper/NonSpatialAcacia and it worked (as I do not have a standard layout), but I get all files in the repo

Re: [git-users] Re: Moving from local svn to git

2013-02-01 Thread Rainer M Krug
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 01/02/13 12:05, Konstantin Khomoutov wrote: On Fri, 01 Feb 2013 11:54:39 +0100 Rainer M Krug r.m.k...@gmail.com wrote: [...] I now did git svn clone file:///home/rkrug/svn/Documents/Publications/2010/Paper/NonSpatialAcacia and it

[git-users] Re: Rebasing problems

2013-02-01 Thread Blind
I tryed your thing, and yes in both cases we end up with a file without 7.5 line in it ... this is not good from my point of view... git rebase --preserve-merges still keeps the S, but he keeps only the info of the changes introduced from the both parents, he forgot about your manual change.

[git-users] Re: Rebasing problems

2013-02-01 Thread Blind
justa little note, if you agree. at this point of your script: - sed --in-place -e '/^9$/i8.5' file git commit -a -m 'Commit T' # Show the commit structure of dev. git log --graph --oneline dev # *** Note that the diffs do not show the line 7.5 added in commit S. git log --graph -p

Re: [git-users] Re: Rebasing problems

2013-02-01 Thread Philip Oakley
Is this what they call an 'Evil Merge' (git style) where the final content was not in either of the original commits. In such cases it's hard to attribute which source commit contained the data that is in the merge. It's as if an additional change was added, over and above choosing between

[git-users] Using Git Notes inside Gerrit Hooks

2013-02-01 Thread krishna chaitanya kurnala
Hello I am trying to come up with a hook that would parse the commit message of any change that is Approved/Merged in Gerrit and add a portion of the commit message to git notes. I added a snippet to change-merged gerrit hook, for example, git fetch origin +refs/notes/*:refs/notes/*