13 Commits

Author	SHA1	Message	Date
Vaida Plankyte	f56ecdd34f	docs: Emphasise WIP PRs in git-guide.md. ... Fiuxes #3233.	2017-06-15 02:05:57 -07:00
Rohitt Vashishtha	7125ea6b61	docs: Update git-guide with tools/clean-branches.	2017-06-06 23:50:36 -07:00
Rohitt Vashishtha	7a81591f38	docs: Update git-guide with tools/fetch-pull-request.	2017-06-06 23:50:36 -07:00
Joshua Pan	11878313fb	docs: Tweak reset-to-pull-request warning. ... Tweaked this warning because we currently check if there are any uncommited changes before we reset to a specific pull request. Changes expanded a bit by tabbott.	2017-04-21 10:12:04 -07:00
Cynthia Lin	ccbe0b56c3	docs: Document zulipbot and its usage. ... Tweaked by tabbott to document why we need it. Fixes #3771	2017-03-04 17:44:43 -08:00
Tim Abbott	e5a3bbab4f	docs: Expand explanation for why we use rebase workflow.	2017-01-22 15:42:27 -08:00
Yago González	8ee8118328	docs: Add explanation on the git rebase workflow.	2017-01-22 15:42:27 -08:00
Rafid Aslam	e0d2839dd7	docs: Fix broken link in git-guide.md ... Update 'how to resolve a merge conflict' link because it is broken, GitHub has change the link to the newer one.	2016-12-10 06:09:46 -08:00
Tim Abbott	b035a6c606	docs: Change dev -> development everywhere.	2016-11-29 14:23:54 -08:00
deekshaarul	3f5ef8df9e	docs: Fix typos in git guide.	2016-11-03 10:12:03 -07:00
Steve Howell	c4b2f6d816	docs: Say "Set up" instead of "Setup". ... I think "setup" generally implies a noun.	2016-10-18 17:29:00 -07:00
Sumana Harihareswara	6323494f37	docs: Properly capitalize GitHub.	2016-10-17 19:31:50 -04:00
Christie Koehler	23df7913d5	docs: Add Git and GitHub Guide. ... Fixes #783, #1754.	2016-10-17 16:18:16 -07:00