Commit Graph

117 Commits

Author SHA1 Message Date
Richard Littauer 8e4d72dbc8 Added git fire
🔥
2015-10-05 10:40:27 -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
orthographic-pedant 792e0deb23 Fixed typographical error, changed accidentaly to accidentally in README. 2015-09-30 13:11:12 -04: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 1edbba171b Added workflow for removing file from commit 2015-09-23 11:42:36 -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
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
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
Richard Littauer ca934fe3ff Added example for changing capitalization of a file 2015-08-18 11:11:17 -04:00
Richard Littauer a1adec8fe4 Add solution for interactively patching part of a new file 2015-08-09 15:20:45 -04:00
Richard Littauer 3260154b76 Added git tips 2015-07-16 14:16:06 -04:00
Bo-Yi Wu 8434388e49 Add GIT utilities 2015-07-16 20:05:27 +08:00
Richard Littauer 1bb6a708ec How to undo a hard reset 2015-07-03 16:22:51 -04:00
Richard Littauer cdef6a1274 Merged two answers 2015-07-03 16:20:02 -04:00
Richard Littauer 875c49d0d1 Added good rebase and merge tutorial 2015-06-30 13:29:52 -04:00
Richard Littauer 84d543db7d Added note about checking for merged branches
This should check if your commits are fully merged or not. Mostly taken from
http://stackoverflow.com/questions/7548926/git-and-the-branch-x-is-not-fully-merged-error.
2015-06-01 09:47:33 +08:00
Joe Block 7792dac8f7 Doctoc update 2015-05-24 22:35:52 -07:00
Joe Block 34a83f3efa Add GUI Clients section 2015-05-24 22:35:34 -07:00
Joe Block a02899c748 Add Tower client 2015-05-24 22:26:56 -07:00
Richard Littauer a3e2e70fa1 Fixed header 2015-05-22 09:26:54 +07:00
Richard Littauer b8bb75da0f Added firstaidgit.io
Closes #54.
2015-05-22 09:14:45 +07:00
Joe Block 45c63ac9f4 Add book section 2015-05-21 19:02:08 -07:00
Joe Block ff99d75be1 Add git-cola 2015-05-21 19:00:08 -07:00
Joe Block 44ebb19dbb Add gitx-dev link 2015-05-21 18:58:21 -07:00
Joe Block 67ed4f0ea5 Forgot to run doctoc after adding 'Other Resources' section 2015-05-19 10:52:56 -07:00
Joe Block 64182bca50 Add Other resources section
* Add link to git-workflow - closes #59
* Add link to git-extra-commands collection of helper scripts
* Add link to source tree
2015-05-19 10:40:24 -07:00
Joe Block a9b0361a88 Strip trailing spaces 2015-05-19 10:40:03 -07:00
Richard Littauer 1b4cad1552 Added a section about deleted PRs 2015-05-19 14:23:25 +07:00
Richard Littauer b0c20c4804 Added explanation of HEAD, kept past example 2015-05-19 14:13:19 +07:00
Arialdo Martini 6a23217314 Using git reset --hard HEAD^, as suggested by @konrado0905 2015-05-19 14:11:34 +07:00
Richard Littauer d673566e0d Rebasing and force pushing 2015-05-15 13:24:00 +07:00
Richard Littauer 1a993cec3e Added text, moved to appropriate section 2015-05-15 13:19:52 +07:00
Richard Littauer 5a0f04c8e9 Merge branch 'patch-2' of https://github.com/stuartpb/git-flight-rules into stuartpb-patch-2 2015-05-15 13:14:04 +07:00
Richard Littauer 9f1fbc5861 Added two sections for moving unstaged edits
I often want to add commits to a new branch, and to an old branch that is empty, but I forget how. Here it is.
2015-05-11 14:00:59 +07:00
Richard Littauer bec92700e4 Merge 2015-04-26 18:18:50 +08:00