Re: [git-users] Static build of git

2013-09-27 Thread Konstantin Khomoutov
On Fri, 27 Sep 2013 11:21:27 -0700 (PDT) Jared Szechy wrote: > I'm having trouble building git statically. [...] Sorry for not answering the question directly (have no time for this at the moment) but attempting to build Git statically may have little sense indeed -- please see [1]. I'd say if

[git-users] Static build of git

2013-09-27 Thread Jared Szechy
I'm having trouble building git statically. I have an entire toolchain that is built statically, there are no shared libraries. I'm trying to build git as a part of this toolchain and it has all kinds of link errors that I think have to do with the configure. I'm running the following config

Re: [git-users] Re: Question: git merge origin/master

2013-09-27 Thread Marcelo Avila
The use of ".." or "..." will depend if you want to include the commit "G" (in my example) or not. With this command you get something next you want: > git log --no-merges -p commi1..commit2 --not master -- *Marcelo Ávila de Oliveira* CPqD - Information Technology Engineer Tel.: +55 19 3705-4125

Re: [git-users] restrict history/messages on push?

2013-09-27 Thread Konstantin Khomoutov
On Wed, 25 Sep 2013 22:19:35 -0400 Tom Roche wrote: [...] > 23rw4kf 23 Sep 2013 09:39 Foo? > 98bjttr 24 Sep 2013 12:34 Rollback! Bar. > 07657ab 25 Sep 2013 10:11 Arrggg! Baz. > 1495fcc 25 Sep 2013 23:45 Self-serving explanation. > > Fred wants to push 1495fcc to the public repo, but

Re: [git-users] Re: Question: git merge origin/master

2013-09-27 Thread Konstantin Kivi
This will work (if use 3 dots instead off 2), but only on entire branch, ( I will see ALL my changes on this branch) If, on the other hand, I want to see changes for, say, last 2 days, I will also get all changes introduced by merge commits that happend in this period. What I want is to see somet

Re: [git-users] Re: Question: git merge origin/master

2013-09-27 Thread Marcelo Avila
Sorry, I think I lost the focus here... Suppose you have something like this: B---E---F---H topic / / A---C---D---G master I think that what you want is: > git diff master..topic Which will show differences introduced by commits B, E, F and H I hope this helps... -- *Marcelo Ávila d

Re: [git-users] Moving from svn

2013-09-27 Thread Konstantin Khomoutov
On Fri, 27 Sep 2013 00:29:47 -0700 (PDT) Fabien Bourigault wrote: > I'm moving my projects from svn. > > With svn I use ssh and a svnserve wrapper like this one : > > #!/bin/sh > umask 002 > exec /usr/bin/svnserve "$@" -r /very/long/path/to/projets > > So I can use URI like this one : svn co

Re: [git-users] gitignore ignored?

2013-09-27 Thread Konstantin Khomoutov
On Fri, 27 Sep 2013 00:53:21 -0700 (PDT) Mauro Sanna wrote: [...] > When I push my commits I see target and its subdirs in the repository. > But target is gitignored, why is it pushed? There are several misunderstandings here: 1) Mechanisms for ignoring files in Git have nothing to do with push

Re: [git-users] Git / vcs newbie question: Sharing changes between branches

2013-09-27 Thread Michael Weise
Hi Konstantin & Gergely, in principle I understand the concept of modularization. My problem is that the differences in the code are on multiple layers that make it very hard to modularize. I'll give some real examples (bootloader for an embedded device) and detail: a) Basic Setup: Device should

Re: [git-users] Re: Git / vcs newbie question: Sharing changes between branches

2013-09-27 Thread Michael Weise
Hi David, haha, looks like our minds work in a similar way. I also started disliking the "one branch per customer" approach. I was planning some kind of refactoring anyway, so using git as a VCS will be part of it. Cheers Christoph On Thu, 26 Sep 2013 16:25:04 +1000 David wrote: > On 25 Sept

[git-users] gitignore ignored?

2013-09-27 Thread Mauro Sanna
Hello. My .gitignore is: *.iws *Db.properties *Db.script .settings stacktrace.log /*.zip /plugin.xml /*.log /*DB.* /cobertura.ser .DS_Store /target/ /out/ /web-app/plugins /web-app/WEB-INF/classes /.link_to_grails_plugins/ /target-eclipse/ When I push my commits I see target and its subdirs in th

Re: [git-users] Re: Git / vcs newbie question: Sharing changes between branches

2013-09-27 Thread Michael Weise
Hi Alex, thanks for the explainations. I maybe misunderstood the way rebase works, so thank you for clarifying. I did have a look into the git documentation already (brilliant!), but I reached a point where it doesn't cover my particular case, so I decided to ask on the mailing list / group where

[git-users] Moving from svn

2013-09-27 Thread Fabien Bourigault
Hi, I'm moving my projects from svn. With svn I use ssh and a svnserve wrapper like this one : #!/bin/sh umask 002 exec /usr/bin/svnserve "$@" -r /very/long/path/to/projets So I can use URI like this one : svn co svn+ssh://m...@my-server.com/my-super-project/trunk How can I achieve the same b