I should stop myself here and just echo what Chad said but I feel compelled to say more.
Skip past the quoted text for the tl;dr version.
That article[1] comes across as incredibly condescending. Is the purpose to keep people ignorant and oppressed? Prevent them from understanding nuance by prescribing one world view and denying any other perspectives? Make them slaves to gerrit? I really fail to see the benefit of such propaganda.
I think it would be great to favor git fetch and git rebase over git pull and merge[1] in the beginners documentation so people don't start out with bad habits.
tl;dr:
# ~/.gitconfig
[branch] autosetuprebase = always
On Mon, May 23, 2016 at 12:32 PM, Chad innocentkiller@gmail.com wrote:
On Mon, May 23, 2016 at 9:42 AM Bernd Sitzmann bernd@wikimedia.org wrote:
I think it would be great to favor git fetch and git rebase over git pull and merge[1] in the beginners documentation so people don't start out
with
bad habits.
[1] https://wikitech.wikimedia.org/wiki/Help:Git_rebase
Bernd
`git pull -r` for life :)
-Chad _______________________________________________ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l