From: Junio C Hamano Date: Thu, 16 Aug 2012 21:09:33 GMT Subject: Re: [PATCH] man: git pull -r is a short for --rebase Message-ID: <7vzk5uzgqa.fsf@alter.siamese.dyndns.org> In-Reply-To: <7v4no21raw.fsf@alter.siamese.dyndns.org> Junio C Hamano writes: > Johannes Sixt 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.