Elijah Newren via GitGitGadget wrote: > 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). > > Changes since v2: > > * Remove some unnecessary changes in patch 4, pointed out by Junio. All my previous objections to v2 still stand: https://lore.kernel.org/git/60f80feeb4461_1305dc208b8@natae.notmuch/ -- Felipe Contreras
