On Mon, Nov 11, 2013 at 10:16 AM, Tommaso Cucinotta <tomm...@lyx.org> wrote:
> On 11/11/13 08:03, Vincent van Ravesteijn wrote: > > First of all, it wouldn't be necessary to merge with master over and > > over again. Chances are not that big that master is now interfering > > with your feature, so don't bother. > > I just realized that the features/chat branch in .git/config has > "rebase=true", > so probably when I pull it's rebased anyway :-). I think I followed > literally > instructions at > > http://wiki.lyx.org/Devel/LyXGit#toc5 > > to create it. > I never use 'git pull', so I'm not familiar with the config options, so I don't know how and when this "rebase=true" is set. It seems wrong to me because you rewrite history every time you pull. That's also in the warning in the git documentation > > > Second, if you want to incorporate changes from master, you should > > merge master into your feature. Whenever you want to merge your > > feature back into master, you can rebase onto master and these merges > > will disappear. > > interesting thought: what is the difference between (assume I'm in my > feature branch) > > $ git merge origin master (or origin/master, whatever syntax merge is > fine with) > git merge only wants a branchname so it will be "origin/master". > $ git pull origin master > > ? "git pull" is sort of equivalent with "git fetch && git merge". There shouldn't be a large difference between the two (except that pull automatically fetches). As said before, this only holds if you don't rebase during a pull. Vincent
