Thread (44 messages) 44 messages, 3 authors, 2021-07-22

RE: [PATCH 6/9] pull: make --rebase and --no-rebase override pull.ff=only

flat view

From: Felipe Contreras <hidden>
Date: 2021-07-17 18:28:48

Elijah Newren via GitGitGadget wrote:
From: Elijah Newren <redacted>

Fix the last few precedence tests failing in t7601 by now implementing
the logic to have --[no-]rebase override a pull.ff=only config setting.
This is a semantic change that breaks current behavior.

Now this does something different:

  git -c pull.ff=only pull --merge

*And* the new behavior is not documented anywhere.

-- 
Felipe Contreras
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help