Commit Graph

191 Commits

Author SHA1 Message Date
Richard Littauer 57b67d4843 Added section on staging and unstaging 2016-12-13 13:03:57 -05:00
Richard Littauer 25bb25a82f Merge pull request #99 from jwilk/spelling
Fix typos
2016-11-13 20:30:03 +09:00
Richard Littauer e1d3f10f38 Merge pull request #100 from jwilk/alias-amend
Fix the "amend" alias
2016-11-13 20:29:17 +09:00
Jakub Wilk c483f0dfda Fix the "amend" alias 2016-11-12 16:11:50 +01:00
Jakub Wilk 4744ae8733 Fix typos 2016-11-12 16:10:29 +01:00
Richard Littauer 2fa0b60933 Moved note to section 2016-08-01 21:20:33 -04:00
Alvaro Garcia 6d0c8e4910 Add rule about bringing changes from another ref-ish 2016-08-01 21:18:59 -04:00
Richard Littauer abaa08d04a Update ToC 2016-08-01 21:08:05 -04:00
Richard Littauer bc09d52f9c Merge pull request #93 from eush77/additions
Add some simpler ways to do the same things
2016-02-22 10:13:47 -05:00
Eugene Sharygin 15fe42de67 add missing preposition 2016-02-22 17:54:12 +03:00
Richard Littauer d87d89abfb Merge pull request #94 from alvarogarcia7/patch-1
add another way of seeing the last committed diff
2016-02-15 12:56:47 -05:00
Richard Littauer aef9e07efc Merge pull request #95 from alvarogarcia7/patch-2
prefer using official (bogus) domain name
2016-02-15 12:55:57 -05:00
Richard Littauer f47b2e66f5 Merge pull request #96 from alvarogarcia7/patch-3
for privacy, hide emails
2016-02-15 12:55:42 -05:00
Alvaro Garcia f852094458 for privacy, hide emails 2016-02-15 00:45:06 +01:00
Alvaro Garcia 8ebbb29f48 prefer using official (bogus) domain name 2016-02-15 00:43:35 +01:00
Alvaro Garcia 35715611d4 add another way of seeing the last committed diff 2016-02-15 00:38:20 +01:00
Eugene Sharygin 7c76618f2e add some simpler ways to do the same things and a bit more info 2016-02-13 01:13:36 +03:00
Richard Littauer a289c22e73 Merge pull request #92 from adjavaherian/master
Credential helper
2015-12-17 18:49:13 -05:00
Amir Djavaherian efafa0dec3 Merge pull request #1 from adjavaherian/adjavaherian-credential-helper
Adding a rule for caching username and password
2015-12-17 12:53:22 -08:00
Amir Djavaherian 70077dbe9f Adding a rule for caching username and password
This describes how you can cache your username and password with credential helper. ala. https://help.github.com/articles/caching-your-github-password-in-git/
2015-12-17 12:52:19 -08:00
Richard Littauer 8e4d72dbc8 Added git fire
🔥
2015-10-05 10:40:27 -04:00
Richard Littauer 9740678d01 Merge branch 'magalhini-recover-deleted-tag' 2015-10-02 08:54:31 -04:00
Ricardo Magalhães 4dbc241226 Merge branch 'recover-deleted-tag' of https://github.com/magalhini/git-flight-rules into magalhini-recover-deleted-tag 2015-10-02 08:54:13 -04:00
Richard Littauer a98fcf9f13 Merge pull request #91 from orthographic-pedant/spell_check/accidentally
Fixed typographical error, changed accidentaly to accidentally in README.
2015-09-30 13:26:26 -04:00
orthographic-pedant 792e0deb23 Fixed typographical error, changed accidentaly to accidentally in README. 2015-09-30 13:11:12 -04:00
Richard Littauer 7bce1f9570 Merge pull request #88 from RichardLitt/feature/62-restructure-doc
Restructured document, closes #62
2015-09-27 08:46:46 -07:00
Richard Littauer 01eddd2ca7 Restructured document, closes #62 2015-09-27 11:45:45 -04:00
Ricardo Magalhães 0bd7dbd106 Consistent naming of tags. 2015-09-27 17:35:43 +02:00
Ricardo Magalhães 6fa3e0c7d9 Add instructions to recover a deleted tag. 2015-09-27 17:28:04 +02:00
Richard Littauer 08ac820a33 Merge pull request #87 from RichardLitt/feature/remove-files-from-commit
Added workflow for removing file from commit
2015-09-23 11:43:02 -04:00
Richard Littauer 1edbba171b Added workflow for removing file from commit 2015-09-23 11:42:36 -04:00
Richard Littauer 3c736dfa26 Merge pull request #86 from appleboy/patch-1
Add another way to change the commit message.
2015-09-03 22:59:08 -04:00
Bo-Yi Wu cb168abd45 update comment. 2015-09-04 10:32:37 +08:00
Bo-Yi Wu 184bcc1ddf Add another way to change commit message. 2015-09-04 08:55:25 +08:00
Kate Hudson d417eedd3b Merge pull request #77 from RichardLitt/feature/edit-amend
Added more text to amend section to explain when it is good to edit a…
2015-09-03 16:07:37 -04:00
Kate Hudson 65e60c8e89 Merge pull request #79 from RichardLitt/feature/delete-branch
Added explanation for deleting a branch
2015-09-03 16:05:04 -04:00
Richard Littauer 1798a7d4c0 Added explanation for deleting a branch 2015-09-03 15:56:51 -04:00
Kate Hudson 5b935d5597 Merge pull request #80 from RichardLitt/feature/reset-single-file
Added explanation for reseting a single file
2015-09-03 15:56:49 -04:00
Kate Hudson 6f8ab94610 Merge pull request #81 from RichardLitt/feature/standardize-syntax
Standardized branch names to my-branch, added missing dollar signs, a…
2015-09-03 15:50:43 -04:00
Kate Hudson 21fca93ac2 Merge pull request #82 from RichardLitt/feature/add-gitup
Added GitUp into resources
2015-09-03 15:39:05 -04:00
Richard Littauer 11cf3c92de Merge pull request #83 from RichardLitt/feature/github-workflow
Added GitHub as a workflow
2015-08-25 14:53:15 -04:00
Kate Hudson 9029bda973 Merge pull request #84 from RichardLitt/feature/reflog
Added a section about reflog, closes #2
2015-08-25 14:46:04 -04:00
Richard Littauer 927ca07ff8 Added a section about reflog, closes #2 2015-08-25 14:37:06 -04:00
Richard Littauer 50780dc043 Added GitHub as a workflow 2015-08-25 14:27:12 -04:00
Richard Littauer 97cada4381 Added GitUp into resources 2015-08-20 12:09:59 -04:00
Richard Littauer 48cce8af6c Standardized branch names to my-branch, added missing dollar signs, and fixed some cases where the order wasn't right. Also added sh to all code blocks where needed, and added `vim` to blocks showing the interactive editor. This closes #76. 2015-08-19 13:48:42 -04:00
Richard Littauer eb73619120 Added explanation for reseting a single file 2015-08-18 16:03:44 -04:00
Kate Hudson bad8c7f6b0 Merge pull request #78 from RichardLitt/feature/remove-cleanup
Merged two questions, as revert applies to both
2015-08-18 16:01:26 -04:00
Richard Littauer a9cb62514a Merged two questions, as revert applies to both 2015-08-18 15:57:09 -04:00
Richard Littauer 6722c72350 Added more text to amend section to explain when it is good to edit a commit 2015-08-18 15:53:51 -04:00