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

2013-09-25 Thread Konstantin Kivi
Hello All. First I must apologize for asking a question in other people's thread (which I don't like myself) , but you are talking about the approach that I am going to use, so decided that this will be appropriate in this case. Here is the question. I recently decided to switch from 'task

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

2013-09-25 Thread Konstantin Kivi
quot;? > > -- > *Marcelo Ávila de Oliveira* > CPqD - Information Technology Engineer > Tel.: +55 19 3705-4125 > mav...@cpqd.com.br > www.cpqd.com.br > > > 2013/9/25 Konstantin Kivi > > >> Hello All. >> >> First I must apologize for asking a question

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

2013-09-26 Thread Konstantin Kivi
hanges while you >> develop your own code, do a git pull --rebase instead of a plain git pull. >> This will rebase your changes on the fresh state of upstream. >> >> Cheers, >> Gergely >> On 26 Sep 2013 05:57, "Konstantin Kivi" > >> wrote: >&

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

2013-09-27 Thread Konstantin Kivi
gt; 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

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

2013-09-29 Thread Konstantin Kivi
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 > mav...@cpqd.com.br > www.cp

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

2013-09-29 Thread Konstantin Kivi
however, such command works as expected (doesn't show merges) git log -p -10 HEAD --not origin/master I have to figure out how to force double --not to work On Mon, Sep 30, 2013 at 7:30 AM, Konstantin Kivi wrote: > according to documentation, this command should work, but it doesn