Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes: > Hi Matthieu, > > On Wed, 13 Jan 2016, Matthieu Moy wrote: > >> Johannes Schindelin <johannes.schindelin@xxxxxx> writes: >> >> What happens if one has branch.*.rebase=interactive, and wants to make >> an exception? Does >> >> git pull --rebase=true >> >> cancel the 'interactive' part? > > It is the same situation as before (just substitute a > branch.*.rebase=preserve setting): yes, the config is parsed first, then > the command line, so the command line wins. > >> I guess it is, but if so I think it should be tested and documented. > > Is this really necessary, given that the behavior has not changed from > before? Well, before your patch, branch.*.rebase=interactive was not possible. It is not immediately clear to me that --rebase=true can mean "do the pull with rebasing, but without going interactive", as "do pull with rebase" and "rebase interactively" could be two independant things. Reading the current doc does not help much: "When true, rebase the current branch on top of the upstream branch after fetching" => it does not say that "true" also specifies which kind of rebase is performed. Actually, I was about to suggest having --rebase=non-interactive when I realized it was already there with the syntax --rebase=true. I can live without it, but I think a documentation improvement would make things clearer. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html