[git-users] avoid pulling binaries

2012-09-25 Thread Angelo Borsotti
Suppose I have a private repository and a public one. I develop using my private repository, and at significant steps I do a commit in which I save all, sources] and binaries. The reason for saving binaries is to allow to recover a previously committed version without having then to rebuild all

Re: [git-users] avoid pulling binaries

2012-09-25 Thread Daniel P. Wright
The SHA-1 hash which identifies each commit in git is generated from the state of the tree at that point and thus having a version of that commit with binaries and a version without results in -- as far as git is concerned -- entirely separate commits. It is really useful when the same commit maps

Re: [git-users] avoid pulling binaries

2012-09-25 Thread Konstantin Khomoutov
On Tue, 25 Sep 2012 02:11:14 -0700 (PDT) Angelo Borsotti wrote: > Suppose I have a private repository and a public one. I develop using > my private repository, and at significant steps I do a commit in > which I save all, sources] and binaries. The reason for saving > binaries is to allow to rec

[git-users] Suitable GIT feature for common artifacts

2012-09-25 Thread Anand Krishnan
Hi Our project has a requirement: We are developing project in c++ for long time and now we started development in java too. Both our c++ and java source code is residing in different repo paths. There are some artifacts which are common for both c++ and Java. As of now we are duplicating those

Re: [git-users] Suitable GIT feature for common artifacts

2012-09-25 Thread Gadget/Steve
On 25/09/2012 1:35 PM, Anand Krishnan wrote: > Hi > Our project has a requirement: We are developing project in c++ for > long time and now we started development in java too. Both our c++ and > java source code is residing in different repo paths. There are some > artifacts which are common for bo

[git-users] Using git-svn to follow a branch: detached

2012-09-25 Thread Chris Stankevitz
Hello, Please consider the attached steps which create an SVN repo and setup git to track it. 1. Why do "local-newbranch" and "master" not share a common ancestor? 2. How do I make them share a common ancestor? 3. Assuming (2) is possible, will I be able to rebase "master" changes onto "local

[git-users] a generalization of git blame

2012-09-25 Thread Xiaozhu Meng
Hi, I have been developing my git tool (based on the git internal API) that can find out all the commits that have changed a line for better authorship. The reason is for my binary code authorship research, I use machine learning to classify code authorship. To produce training data, I start

Re: [git-users] a generalization of git blame

2012-09-25 Thread Konstantin Khomoutov
On Tue, 25 Sep 2012 10:14:03 -0700 (PDT) Xiaozhu Meng wrote: [...] > PS: I was trying to send an email to mailing list > git at vger.kernel.org. But it always replied with [...] > The error that the other server returned was: 550 550 5.7.1 > Content-Policy reject msg: The message contains HTML s

[git-users] Forcing a "push" from one branch to another

2012-09-25 Thread Chris Stankevitz
Hello, If possible please humor me and attempt to answer this question: How do I make "b" look exactly like "a" using one commit? Here is the manual approach: - git checkout a. Recursively copy all files in to /tmp - git checkout b - recursively copy all files from /tmp into cwd - git add [as

Re: [git-users] Forcing a "push" from one branch to another

2012-09-25 Thread Philip Oakley
From: Chris Stankevitz To: git-users@googlegroups.com Sent: Tuesday, September 25, 2012 7:31 PM Subject: [git-users] Forcing a "push" from one branch to another Hello, If possible please humor me and attempt to answer this question: How do I make "b" look exactly like "a" usin

Re: [git-users] Forcing a "push" from one branch to another

2012-09-25 Thread Chris Stankevitz
On Tuesday, September 25, 2012 11:48:25 AM UTC-7, Philip Oakley wrote: > > Do you mean you want Branch 'b' drop its old line of development and > become the same as Branch 'a'. > Or you want Branch 'b' to gain a fresh commit who's content is identical > to that on the tip of Branch 'a', but it w

Re: [git-users] Forcing a "push" from one branch to another

2012-09-25 Thread Philip Oakley
From: Chris Stankevitz To: git-users@googlegroups.com Cc: Chris Stankevitz ; Philip Oakley Sent: Tuesday, September 25, 2012 8:01 PM Subject: Re: [git-users] Forcing a "push" from one branch to another On Tuesday, September 25, 2012 11:48:25 AM UTC-7, Philip Oakley wrote: Do you

Re: [git-users] Forcing a "push" from one branch to another

2012-09-25 Thread PJ Weisberg
On Tue, Sep 25, 2012 at 12:01 PM, Chris Stankevitz wrote: > At this point, I'd be happy with whichever method will be easiest for you to > type on this list. Currently I am using the series of laborious steps in my > original post. I would just do this: git checkout b# Switch to th

Re: [git-users] Using git-svn to follow a branch: detached

2012-09-25 Thread Daniel P. Wright
Chris Stankevitz ( 9月25日(火)) >> > Hello, > > Please consider the attached steps which create an SVN repo and setup git > to track it. > > 1. Why do "local-newbranch" and "master" not share a common ancestor? I think the reason is that the method you've used to add the branch to git-svn treats t