Junio C Hamano <gits...@pobox.com> writes: > Johannes Sixt <j...@kdbg.org> writes: > >> Are you sure? This adds '-r', not '--r', i.e., the single-letter option >> 'r', to the documentation, which is not something we want to hide, usually. > > I actually think "--rebase" squatting on short-and-sweet "-r" was an > accident, and we are saved by not endorsing "pull -r" by documenting > it. We can still use "-r" for "--recurse-submodules" if that proves > to give more value than "--rebase" to our users. > > So I dunno. I personally do not think either deserves a short-and-sweet > single letter option.
I guess the above needs a bit of clarification. The reason I do not think "pull -r" gives much value to the users to trigger "pull --rebase" is because the use of "pull --rebase" is very project specific. If you are working on a project that forbids merges, you would _always_ want to run "pull --rebase", which means you would likely have it configured and would not be typing from the command line. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html