[git-users] Re: Output from push

2010-12-10 Thread Konstantin Khomoutov
On Nov 24, 2:20 pm, Roddie Grant gitl...@myword.co.uk wrote: [...] To make things simpler to grok, you can think of all those three types of objects as being plain text files. Playing with `git ls-tree` and `git cat-file` can give a very clear idea about how objects reference one another.

Re: [git-users] Re: Output from push

2010-12-10 Thread Rick DeNatale
On Fri, Dec 10, 2010 at 3:46 AM, Konstantin Khomoutov khomou...@gmail.com wrote: On Nov 24, 2:20 pm, Roddie Grant gitl...@myword.co.uk wrote: [...] To make things simpler to grok, you can think of all those three types of objects as being plain text files. Playing with `git ls-tree` and `git

[git-users] Merge log about same user.

2010-12-10 Thread Marcello Henrique
Hello, Hello, I have a git repository, I commited by diferent accounts just that same people. How merge historic into logs? Thanks in advance. -- Marcello Henrique Blog - http://faraohh.wordpress.com Associação Software Livre de Goiás (www.aslgo.org.br) Cercomp - UFG (www.cercomp.ufg.br) --

Re: [git-users] Re: Output from push

2010-12-10 Thread Konstantin Khomoutov
Rick DeNatale wrote: [...] I've spotted one minor deficiency in the article so far (there's no such thing as the HEAD of the current branch as Git maintains just one HEAD ref) Not exactly. .git/HEAD contains an indirect reference to a git ref so, if I'm working on the branch foo $cat

[git-users] Re: Merge log about same user.

2010-12-10 Thread Konstantin Khomoutov
Marcello Henrique wrote: I have a git repository, I commited by diferent accounts just that same people. How merge historic into logs? I can't quite parse this. Do you mean you have a line (or lines) of commits made by different committers which are, in fact, the same person, and now you want

[git-users] Re: pulling from a git svn repo locally

2010-12-10 Thread Konstantin Khomoutov
steve.maring wrote: [...] $ git svn clone -s http://192.168.1.10/svn/project project that will checkout http://192.168.1.10/svn/project/trunk to project now, I go over to my shared folder space and make a git repo ... [...] and then, the interesting thing to note is that over in

Re: [git-users] Re: Merge log about same user.

2010-12-10 Thread Marcello Henrique
Hi, The first option, commits made by different committers which are, in fact, the same person. On Fri, Dec 10, 2010 at 14:21, Konstantin Khomoutov khomou...@gmail.com wrote: Marcello Henrique wrote: I have a git repository, I commited by diferent accounts just that same people. How merge

Re: [git-users] Re: Merge log about same user.

2010-12-10 Thread Konstantin Khomoutov
Marcello Henrique wrote: The first option, commits made by different committers which are, in fact, the same person. Then you should probably use a properly instrumented call to `git filter-branch --commit-filter` According to the git-filter-branch manual [1], it exports a set of environment

Re: [git-users] Re: Merge log about same user.

2010-12-10 Thread Marcello Henrique
Hi Konstantin, Exactly what I needed, I'll read the manual reference that you indicated. Thanks very much. On Fri, Dec 10, 2010 at 15:34, Konstantin Khomoutov khomou...@gmail.com wrote: Marcello Henrique wrote: The first option, commits made by different committers which are, in fact, the

[git-users] Re: Output from push

2010-12-10 Thread Jeenu
On Dec 10, 1:46 pm, Konstantin Khomoutov khomou...@gmail.com wrote: I recently came across this paper [1] which you may find useful as it tries to explain Git on the object level, showing the precise steps Git performs to create a new commit. [...]

Re: [git-users] Re: Output from push

2010-12-10 Thread Rick DeNatale
On Fri, Dec 10, 2010 at 11:14 AM, Konstantin Khomoutov khomou...@gmail.com wrote: The idea is that the HEAD is a distinguished reference, which is used to point to the commit object on which the work tree is based, and it has no inherent relation to the notion of the current branch. Actually