Commit Graph

447 Commits (master)
 

Author SHA1 Message Date
Richard Littauer e575e47aaa Added commit amend simple message 9 years ago
Dan Dascalescu 0a2f618d0f Add a few recipes 10 years ago
Aldric Giacomoni 177d178c50 Fix typo 10 years ago
Joe Block 0ed6dbf706 Remove typo aliases, add co = checkout 10 years ago
Richard Littauer 9d45f6a273 Add stronger language for force push
It will conflicts in the source history, and may interfere with other branches regardless of amount of developers on the team.
10 years ago
Joe Block a4a708b9df Add missing anchor tag 10 years ago
Joe Block cf111f959c Add instructions for deleting stale branches 10 years ago
Joe Block 9fba446438 Add example - unpushed aliases to log @{u} 10 years ago
Joe Block 8d2c660b3c Add some command aliases. 10 years ago
Kate Hudson fc2ec9c64a Merge pull request #21 from jwhear/master
Use `branch` instead of `checkout -b`
10 years ago
Kate Hudson 0b5b0762e3 Merge pull request #19 from sconklin/master
add instructions for changing the author of the last commit
10 years ago
Kate Hudson b3cbdcc589 Merge pull request #14 from unixorn/show-rebasing-unpushed-commits
Add entry for safe rebasing of unpushed commits
10 years ago
Kate Hudson 2566992128 Merge pull request #24 from robins/master
Correct typo - Situations
10 years ago
Kate Hudson 44ca1a7885 Merge pull request #25 from opinxit/push-f
avoid force pushing
10 years ago
Chris O'Connor e001f275ae avoid force pushing 10 years ago
siemiatj 9b88f428a4 -add section for reflog 10 years ago
Kate Hudson 722787c17b Merge pull request #13 from siemiatj/master
Add section about reflog
10 years ago
Robins e7310f3cff Correct typo - Situations
Correct typo - Situations (not Sitautions)
10 years ago
Stuart P. Bentley a53267fd27 Add "I need to undo my last commit" 10 years ago
Stuart P. Bentley abb085de05 Add "Oh crap, what did I just commit" 10 years ago
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.
10 years ago
Steve Conklin 1b8e378cf4 add instructions for changing the author of the last commit 10 years ago
Christophe Naud-Dulude 6526fc148f Fix typo 10 years ago
Jason Moore 9f20e13e41 fix prompt to match style guide 10 years ago
Jason Moore 36b4aadc11 add 4 tips 10 years ago
siemiatj 3399886f03 -add section for reflog 10 years ago
Kate Hudson 9536d6987d Merge pull request #15 from Chris911/master
Fix typo
10 years ago
Christophe Naud-Dulude 7131d015d0 Fix typo 10 years ago
Joe Block f160a96ef6 Add entry for safe rebasing of unpushed commits 10 years ago
Kate Hudson af732704df Merge pull request #7 from jackmaney/master
Added anchor points to sections.
10 years ago
Jack Maney 2a01c08c37 Merged #7 with upstream 10 years ago
Cameron Drake 978e484967 Update README.md 10 years ago
Kate Hudson 69204cdf0a Fixes #6: Force pushing after amending commits 10 years ago
Jack Maney 3e6efe1c7e Added anchor points to sections.
Added anchor points so that links can be created to the merge conflict section, etc.
10 years ago
Kate Hudson 14979dd611 Merge pull request #5 from jackmaney/master
Replaced "brackets" with "parentheses"
10 years ago
Jack Maney ceaaf34970 Replaced "brackets" with "parentheses"
...since the branch name *is* in parentheses, not brackets.
10 years ago
Kate Hudson 9cc11b7b24 Merge pull request #1 from lennym/patch-1
Add note about "care" when force-pushing
10 years ago
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.
10 years ago
Kate Hudson 0b1f8fe4b6 Added note about force pushing 10 years ago
Kate Hudson 69afe5e1ec Update README.md 10 years ago
Kate Hudson 29550231a2 Update README.md 10 years ago
Kate Hudson 354b625966 Defining flight rules 10 years ago
Kate Hudson 5d5c1324a0 Updated language of titles 10 years ago
Kate Hudson 6c03b259e8 what are flight rules 10 years ago
Kate Hudson 1a9c54d73b updates 10 years ago
Kate Hudson 45725ed8b9 formatting 10 years ago
Kate Hudson 68c0e673b1 added readme 10 years ago