[git-users] Re: git pull-push ?

2014-06-26 Thread Pierre-François CLEMENT
Le mercredi 25 juin 2014 13:15:23 UTC+2, Konstantin Khomoutov a écrit : > The imaginary `git pull-push` has no sense as `git pull` might > legitimately result in a merge conflict. Note that `git pull` is a > sort of macro for `git fetch` + `git merge` which just makes certain > (rather strong)

[git-users] git log --graph

2014-06-26 Thread dexter ietf
how to interpret the output of git log --graph, is there any explanation or good documentation available for this. -dexter -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it

[git-users] Re: git log --graph

2014-06-26 Thread Thomas Ferris Nicolaisen
On Thursday, June 26, 2014 10:53:41 AM UTC+2, dexter ietf wrote: > > how to interpret the output of git log --graph, is there any explanation > or good documentation available for this. > > The graph is a good way to get your bearings on how different commits and branches relate to each other

Re: [git-users] Re: git pull-push ?

2014-06-26 Thread Konstantin Khomoutov
On Thu, 26 Jun 2014 01:44:34 -0700 (PDT) Pierre-François CLEMENT wrote: > > The imaginary `git pull-push` has no sense as `git pull` might > > legitimately result in a merge conflict. Note that `git pull` is a > > sort of macro for `git fetch` + `git merge` which just makes > > certain (rather

Re: [git-users] Re: git pull-push ?

2014-06-26 Thread Pierre-François CLEMENT
Le jeudi 26 juin 2014 13:04:18 UTC+2, Konstantin Khomoutov a écrit : > > On Thu, 26 Jun 2014 01:44:34 -0700 (PDT) > Pierre-François CLEMENT > wrote: > > > > The imaginary `git pull-push` has no sense as `git pull` might > > > legitimately result in a merge conflict. Note that `git pull` is a >

Re: [git-users] Re: git pull-push ?

2014-06-26 Thread Konstantin Khomoutov
On Thu, 26 Jun 2014 04:42:38 -0700 (PDT) Pierre-François CLEMENT wrote: [...] > What I do not understand however, is what made you think *treaki* > needed these explanations in the first place? Don't get me wrong, > it's no big deal; but I could have asked the same question, and I > would have ap

[git-users] Submodules, subtrees or something else?

2014-06-26 Thread Bojan Stankovic
Hello! I have a situation with a larger project that has lots of modules/libraries with their respective repos. Most of these modules are dependencies of other modules which are than dependencies of a project. And now it has come to the point where the main project has several sub-projects and

[git-users] Git sub modules

2014-06-26 Thread chunnu
Hi, I m new to git repository, with a star team back ground. In my project I have something called sub modules. I understand that these are a single repository in the git used by 5 different projects. But I m very confused about "updating the submodule references". What does this exactly mean?