Alex Henrie <alexhenrie24@xxxxxxxxx> writes: > Often novice Git users forget to say "pull --rebase" and end up with an > unnecessary merge from upstream. What they usually want is either "pull > --rebase" in the simpler cases, or "pull --ff-only" to update the copy > of main integration branches, and rebase their work separately. The > pull.rebase configuration variable exists to help them in the simpler > cases, but there is no mechanism to make these users aware of it. > > Issue a warning message when no --[no-]rebase option from the command > line and no pull.rebase configuration variable is given. This will > inconvenience those who never want to "pull --rebase", who haven't had > to do anything special, but the cost of the inconvenience is paid only > once per user, which should be a reasonable cost to help a number of new > users. > > Signed-off-by: Alex Henrie <alexhenrie24@xxxxxxxxx> > --- > v5: > - Supress warning when --quiet is given > - Ensure that pull option tests still test what they're supposed to test > - Add tests for the new warning Thanks, will queue.
