Commit Graph

191 Commits

Author SHA1 Message Date
Joe Block cf111f959c Add instructions for deleting stale branches 2014-08-22 14:07:36 -07:00
Joe Block 9fba446438 Add example - unpushed aliases to log @{u} 2014-08-22 13:53:19 -07:00
Joe Block 8d2c660b3c Add some command aliases. 2014-08-22 13:33:56 -07:00
Kate Hudson fc2ec9c64a Merge pull request #21 from jwhear/master
Use `branch` instead of `checkout -b`
2014-08-22 14:55:09 -04:00
Kate Hudson 0b5b0762e3 Merge pull request #19 from sconklin/master
add instructions for changing the author of the last commit
2014-08-22 14:54:38 -04:00
Kate Hudson b3cbdcc589 Merge pull request #14 from unixorn/show-rebasing-unpushed-commits
Add entry for safe rebasing of unpushed commits
2014-08-22 14:52:34 -04:00
Kate Hudson 2566992128 Merge pull request #24 from robins/master
Correct typo - Situations
2014-08-22 14:51:57 -04:00
Kate Hudson 44ca1a7885 Merge pull request #25 from opinxit/push-f
avoid force pushing
2014-08-22 14:51:43 -04:00
Chris O'Connor e001f275ae avoid force pushing 2014-08-19 14:48:43 -04:00
siemiatj 9b88f428a4 -add section for reflog 2014-08-18 13:28:16 -07:00
Kate Hudson 722787c17b Merge pull request #13 from siemiatj/master
Add section about reflog
2014-08-14 19:52:50 -07:00
Robins e7310f3cff Correct typo - Situations
Correct typo - Situations (not Sitautions)
2014-08-15 06:04:50 +05:30
Stuart P. Bentley a53267fd27 Add "I need to undo my last commit" 2014-08-14 12:01:43 -07:00
Stuart P. Bentley abb085de05 Add "Oh crap, what did I just commit" 2014-08-14 11:46:47 -07:00
Justin Whear 951e37cc2e Use `branch` instead of `checkout -b`
Using `checkout -b` to create a new branch only to immediately checkout the previous branch is kind of pointless.
2014-08-14 10:41:04 -07:00
Steve Conklin 1b8e378cf4 add instructions for changing the author of the last commit 2014-08-07 07:41:35 -05:00
Christophe Naud-Dulude 6526fc148f Fix typo 2014-08-05 13:39:03 -07:00
Jason Moore 9f20e13e41 fix prompt to match style guide 2014-07-31 23:21:46 -04:00
Jason Moore 36b4aadc11 add 4 tips 2014-07-31 23:16:43 -04:00
siemiatj 3399886f03 -add section for reflog 2014-07-31 17:19:49 +02:00
Kate Hudson 9536d6987d Merge pull request #15 from Chris911/master
Fix typo
2014-07-31 06:28:55 -07:00
Christophe Naud-Dulude 7131d015d0 Fix typo 2014-07-30 14:59:12 -07:00
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