RE: [PATCH 0/9] Handle pull option precedence
Elijah Newren via GitGitGadget wrote:
Show 12 quoted lines
> Based on a recent list of rules for flag/option precedence for git-pull[1]
> from Junio (particularly focusing on rebase vs. merge vs. fast-forward),
> here's an attempt to implement and document it. Given multiple recent
> surprises from users about some of these behaviors[2][3] and a coworker just
> yesterday expressing some puzzlement with git-pull and rebase vs. merge, it
> seems like a good time to address some of these issues.
>
> Since the handling of conflicting options was holding up two of Alex's
> patches[4][5], and his patches fix some of the tests, I also include those
> two patches in my series, with a few small changes to the first (so I've
> kept him as author) and more substantial changes to the second (so I've
> given him an Initial-patch-by attribution).
Once again this is the wrong approach.
1. It's inconsistent with the current documentation
2. It treats configuration and command line arguments differently when
the documentation says they are the same
3. It breaks behavior users are currently relying on
4. It changes default behavior without warning users that such
behavior is going to change (0 days of deprecation)--
Felipe Contreras
Felipe Contreras <felipe.contreras@gmail.com>