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

2013-09-26 Thread David
On 25 September 2013 22:23, Michael Weise michael.we...@ek-team.de wrote: Thanks a lot guys, this was exactly the kind of information I was looking for! Hi again Michael I just came across this today, I recommend it: https://github.com/pluralsight/git-internals-pdf/releases (click on the pdf

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

2013-09-26 Thread Gergely Polonkai
Hello, first of all, Fred should stop using such commit messages :-) Seriously speaking, I think that's where git rebase -i comes in. Before pushing, rebase on the last public commit, and edit/squash the unnecessary commits. Cheers, Gergely On 26 Sep 2013 04:19, Tom Roche tom_ro...@pobox.com

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

2013-09-26 Thread Gergely Polonkai
Hello, The point is to rebase before pushing, thus, only rearrange/edit only the commits that haven't gone public yet. Rebasing is only a bad idea if you do it with already pushed commits. The other use case is rebase on pull. If your upstream changes while you develop your own code, do a git

Re: [git-users] Git Pro: PDF versions in English and other languages

2013-09-26 Thread Florian Loch
Hi Martin, were you able to create the German pdf file yet? You told automatix to send a pm to you, then you would mail him the German version. I would really catch at the offer, but actually I do not use Google Groups regulary and therefore didn't find a way to send a pm... Would be great, if

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

2013-09-26 Thread Marcelo Avila
Yes, if somebody do any commit based on your commits you can not use rebase, but this must only happen when your task is done and you do not want to use rebase anymore. In other words, work in you tasks rebasing when needed, you can share your commits to someone but nobody can make commits based

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

2013-09-26 Thread PJ Weisberg
On Sep 26, 2013 12:05 AM, Gergely Polonkai gerg...@polonkai.eu wrote: Hello, first of all, Fred should stop using such commit messages :-) Seriously speaking, I think that's where git rebase -i comes in. Before pushing, rebase on the last public commit, and edit/squash the unnecessary

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

2013-09-26 Thread Tom Roche
https://groups.google.com/forum/#!topic/git-users/nzwVr5li3cM Tom Roche How to restrict the commit history or messages that get pushed to a remote repository? ... Gergely Polonkai ... git rebase -i[.] Before pushing, rebase on the last public commit, and edit/squash the unnecessary

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

2013-09-26 Thread Konstantin Kivi
If we get back to my question - there is no way to see difference between between two arbitrary commits in my task branch excluding diffs resulted from merges, right ? четверг, 26 сентября 2013 г., 16:21:46 UTC+4 пользователь Marcelo Avila написал: Yes, if somebody do any commit based on