Re: The git spring cleanup challenge

Felipe Contreras [off-list ref] writes:

Sergey Organov wrote:

quoted

Felipe Contreras [off-list ref] writes:

quoted

Sergey Organov wrote:

quoted

Felipe Contreras [off-list ref] writes:

quoted

quoted

These are the configurations I've chosen:

  [merge]
    conflictstyle = diff3
  [sendemail]
    smtpserver = /usr/bin/msmtp

[pull]
	rebase = merges

Can you do `git pull --rebase=merges` for a while?

I never use 'git pull' for merging, and all the time with rebasing, so
what's the point? I mean, whenever I do 'git pull' I mean 'git pull
--rebase', and whenever I need to merge, I exclusively use'git merge'.

So you can remove that configuration.

Sorry, I can't, see below.

And afterwareds set pull.rebase=true so you don't need to specify
--rebase.

I don't get it. What's the point using pull.rebase=true instead of
pull.rebase=merges? The former is plain total disaster in my opinion as
it silently breaks history shape. I'd rather suggest to make
pull.rebase=true a synonym for pull.rebase=merges.

Thanks,
-- Sergey Organov

Sergey Organov wrote:

Felipe Contreras [off-list ref] writes:

quoted

Sergey Organov wrote:

quoted

Felipe Contreras [off-list ref] writes:

quoted

Sergey Organov wrote:

quoted

quoted

quoted

quoted

[pull]
	rebase = merges

Can you do `git pull --rebase=merges` for a while?

I never use 'git pull' for merging, and all the time with rebasing, so
what's the point? I mean, whenever I do 'git pull' I mean 'git pull
--rebase', and whenever I need to merge, I exclusively use'git merge'.

So you can remove that configuration.

Sorry, I can't, see below.

quoted

And afterwareds set pull.rebase=true so you don't need to specify
--rebase.

I don't get it. What's the point using pull.rebase=true instead of
pull.rebase=merges? The former is plain total disaster in my opinion as
it silently breaks history shape.

I think there's some confusion here.

You said you always did `git pull --rebase`, not
`git pull --rebase=merges`.

The equivalent configurations are:

  git pull --rebase		=> pull.rebase=true
  git pull --rebase=merges	=> pull.rebase=merges

If you can't live without the functionality `pull.rebase=merges` gives
you, that means you have to type `git pull --rebase=merges` if you don't
have such configuration.

Cheers.

-- 
Felipe Contreras