On 2014-04-29 07:17, Felipe Contreras wrote:
> Also 'branch..rebase' to 'branch..pullmode'.
>
> This way 'pull.mode' can be set to 'merge', and the default can be
> something else.
>
> The old configurations still work, but get deprecated.
Should users be warned if both pull.rebase and pull.mode
From: "Felipe Contreras"
Philip Oakley wrote:
From: "Felipe Contreras"
> Also 'branch..rebase' to 'branch..pullmode'.
Sorry I haven't commented earlier. Because the 0/6 explanation isn't
a
commit, a few extra words would be useful to capture what the 0/6
cover
letter said to start the patc
Philip Oakley wrote:
> From: "Felipe Contreras"
> > Also 'branch..rebase' to 'branch..pullmode'.
>
> Sorry I haven't commented earlier. Because the 0/6 explanation isn't a
> commit, a few extra words would be useful to capture what the 0/6 cover
> letter said to start the patch series cleanly/cle
From: "Felipe Contreras"
Also 'branch..rebase' to 'branch..pullmode'.
Sorry I haven't commented earlier. Because the 0/6 explanation isn't a
commit, a few extra words would be useful to capture what the 0/6 cover
letter said to start the patch series cleanly/clearly e.g. start with
Begin t
Marat Radchenko wrote:
> Felipe Contreras wrote
> > [PATCH v5 1/6] pull: rename pull.rename to pull.mode
>
> s/pull.rename/pull.rebase/
Right. Will fix.
--
Felipe Contreras
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
Felipe Contreras wrote
> [PATCH v5 1/6] pull: rename pull.rename to pull.mode
s/pull.rename/pull.rebase/
--
View this message in context:
http://git.661346.n2.nabble.com/PATCH-v5-0-6-Reject-non-ff-pulls-by-default-tp7609118p7609129.html
Sent from the git mailing list archive at Nabble.
Also 'branch..rebase' to 'branch..pullmode'.
This way 'pull.mode' can be set to 'merge', and the default can be
something else.
The old configurations still work, but get deprecated.
Signed-off-by: Felipe Contreras
---
Documentation/config.txt | 34 +-
Documen
7 matches
Mail list logo
