mirrors/git-flight-rules
mirrors
/
git-flight-rules
mirror of https://github.com/k88hudson/git-flight-rules.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
447 Commits 6 Branches 0 Tags 1.7 MiB
Commit Graph

447 Commits

Author SHA1 Message Date
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
Richard Littauer 4622e309f1 Merge pull request #74 from RichardLitt/feature/capitalization 
Added example for changing capitalization of a file
 2015-08-18 15:27:11 -04:00
Richard Littauer 4f9e6fff47 Merge pull request #75 from RichardLitt/feature/contribute 
Added a contribute file
 2015-08-18 15:26:44 -04:00
Richard Littauer ad0dd58329 Added a contribute file 2015-08-18 11:24:27 -04:00
Richard Littauer ca934fe3ff Added example for changing capitalization of a file 2015-08-18 11:11:17 -04:00
Kate Hudson e046ac055c Merge pull request #73 from RichardLitt/feature/add-partial-new-file 
Add solution for interactively patching part of a new file
 2015-08-09 20:18:37 -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 aefbf8fa39 Merge pull request #71 from RichardLitt/feature/git-tips 
Added git tips
 2015-07-16 14:16:36 -04:00
Richard Littauer 3260154b76 Added git tips 2015-07-16 14:16:06 -04:00
Richard Littauer 1e74631336 Merge pull request #72 from appleboy/patch-1 
Add GIT utilities
 2015-07-16 14:14:10 -04:00
Bo-Yi Wu 8434388e49 Add GIT utilities 2015-07-16 20:05:27 +08:00
Richard Littauer 896d792a27 Merge pull request #70 from RichardLitt/feature/undo-reset-hard 
How to undo a hard reset
 2015-07-05 11:29:52 -04: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 02e9ec921f Merge pull request #63 from RichardLitt/feature/merged-commits 
Added note about checking for merged branches
 2015-06-01 09:48:25 +08: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
Richard Littauer a4af688a5c Merge pull request #69 from unixorn/master 
Break GUI clients out into separate section
 2015-05-26 08:21:39 +07: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 78f470427c Merge pull request #68 from RichardLitt/master 
FirstAidGit
 2015-05-22 09:16:59 +07:00
Richard Littauer a5c51421c3 Merge branch 'feature/first-aid-git' 2015-05-22 09:15:55 +07:00
Richard Littauer c0bd172d03 Merge branch 'feature/first-aid-git' of git://github.com/k88hudson/git-flight-rules into feature/first-aid-git 2015-05-22 09:15:19 +07:00
Richard Littauer b8bb75da0f Added firstaidgit.io 
Closes #54.
 2015-05-22 09:14:45 +07:00
Richard Littauer a8e6825f90 Merge pull request #67 from unixorn/add-more-resources 
Add more git clients, Add Book section to Other Resources
 2015-05-22 09:11:05 +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
Richard Littauer eaa3353fa2 Merge pull request #66 from unixorn/update-doctoc 
Forgot to run doctoc after adding 'Other Resources' section
 2015-05-20 08:42:59 +07:00
Joe Block 67ed4f0ea5 Forgot to run doctoc after adding 'Other Resources' section 2015-05-19 10:52:56 -07:00
Richard Littauer f9b72fe495 Added firstaidgit.io 
Closes #54.
 2015-05-20 00:47:29 +07:00
Richard Littauer efb1619f25 Merge pull request #64 from unixorn/master 
Add "Other Resources" section
 2015-05-20 00:45:32 +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 264d3dde33 Merge pull request #61 from RichardLitt/feature/deleted-fork 
Added a section about deleted PRs
 2015-05-20 00:19:46 +07:00
Richard Littauer 1b4cad1552 Added a section about deleted PRs 2015-05-19 14:23:25 +07:00
Richard Littauer aeaa38e922 Merge pull request #60 from RichardLitt/feature/arialdomartini 
`git reset --hard master~1` rather than `git reset --hard a13b85e`
 2015-05-19 14:15:27 +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 e4fe866e14 Merge pull request #56 from RichardLitt/force-push-rebase 
Rebasing and force pushing
 2015-05-16 01:37:47 +07:00
Richard Littauer d673566e0d Rebasing and force pushing 2015-05-15 13:24:00 +07:00
Richard Littauer 08bbf9a967 Merge pull request #58 from RichardLitt/master 
Merge stuartpb-patch-2
 2015-05-15 13:21:03 +07:00
Richard Littauer a32ec5590e Merge branch 'stuartpb-patch-2' 2015-05-15 13:20:02 +07:00