419 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Joe Block	f160a96ef6	Add entry for safe rebasing of unpushed commits	2014-07-30 14:57:27 -07:00
Kate Hudson	af732704df	Merge pull request #7 from jackmaney/master ... Added anchor points to sections.	2014-07-30 13:09:55 -04:00
Jack Maney	2a01c08c37	Merged #7 with upstream	2014-07-29 17:54:47 -05:00
Cameron Drake	978e484967	Update README.md	2014-07-29 11:53:00 -07:00
Kate Hudson	69204cdf0a	Fixes #6: Force pushing after amending commits	2014-07-29 13:14:46 -04:00
Jack Maney	3e6efe1c7e	Added anchor points to sections. ... Added anchor points so that links can be created to the merge conflict section, etc.	2014-07-29 11:44:39 -05:00
Kate Hudson	14979dd611	Merge pull request #5 from jackmaney/master ... Replaced "brackets" with "parentheses"	2014-07-29 12:41:12 -04:00
Jack Maney	ceaaf34970	Replaced "brackets" with "parentheses" ... ...since the branch name *is* in parentheses, not brackets.	2014-07-29 11:26:16 -05:00
Kate Hudson	9cc11b7b24	Merge pull request #1 from lennym/patch-1 ... Add note about "care" when force-pushing	2014-07-28 18:38:49 -04:00
Leonard Martin	20dc20e9ae	Add note about "care" when force-pushing ... It wasn't obvious exactly how a user should "be careful" when force-pushing. Being explicit about what exactly it is important to take care to do can improve confidence in the process.	2014-07-28 23:36:06 +01:00
Kate Hudson	0b1f8fe4b6	Added note about force pushing	2014-07-25 14:31:24 -04:00
Kate Hudson	69afe5e1ec	Update README.md	2014-07-22 16:55:20 -04:00
Kate Hudson	29550231a2	Update README.md	2014-07-22 16:52:45 -04:00
Kate Hudson	354b625966	Defining flight rules	2014-07-22 16:52:19 -04:00
Kate Hudson	5d5c1324a0	Updated language of titles	2014-07-22 16:50:01 -04:00
Kate Hudson	6c03b259e8	what are flight rules	2014-07-22 16:47:10 -04:00
Kate Hudson	1a9c54d73b	updates	2014-07-22 16:46:24 -04:00
Kate Hudson	45725ed8b9	formatting	2014-07-22 16:35:05 -04:00
Kate Hudson	68c0e673b1	added readme	2014-07-22 16:33:36 -04:00