alvaro/git-flight-rules
1
0
Fork 0
mirror of https://github.com/k88hudson/git-flight-rules.git synced 2025-03-10 12:48:43 -03:00
Code Issues Releases Wiki Activity
271 Commits 6 Branches 0 Tags
Commit Graph

271 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
8c4e12be63 Merge pull request #57 from RichardLitt/feature/commits-to-old-branch 
Added two sections for moving unstaged edits
 2015-05-14 05:31:22 +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
0f7027159a Merge pull request #55 from RichardLitt/master 
Merge
 2015-04-26 18:19:47 +08:00
Richard Littauer
8c5b442718 Merge branch 'stuartpb-patch-1' 2015-04-26 18:19:00 +08:00
Richard Littauer
bec92700e4 Merge 2015-04-26 18:18:50 +08:00
Richard Littauer
2ebceca748 Merge pull request #53 from unixorn/master 
Minor typo fix, remove trailing spaces
 2015-04-21 14:31:46 +07:00
Joe Block
ab17fbc6ab Minor typo fix, remove trailing spaces 2015-04-20 23:39:46 -07:00
Richard Littauer
597bde6d7b Merge pull request #52 from RichardLitt/master 
Merged in the Delete PR
 2015-03-23 11:17:34 +08:00
Richard Littauer
caf8d3c8b4 Made a deleting category 2015-03-23 11:15:55 +08:00
Richard Littauer
08ced44cd3 Merge branch 'patch-1' of https://github.com/dandv/git-flight-rules into dandv-patch-1 
# Conflicts:
#	README.md
 2015-03-23 11:13:54 +08:00
Richard Littauer
2bf72a4ec4 Merge pull request #51 from RichardLitt/master 
RM tips
 2015-03-21 10:16:18 +08:00
Richard Littauer
46aff394db Merge branch 'jm-tips' of https://github.com/xinsight/git-flight-rules into xinsight-jm-tips 2015-03-21 10:13:04 +08:00
Richard Littauer
0fe348620e Merge pull request #50 from RichardLitt/master 
Removed second force-push section
 2015-03-20 20:42:15 +08:00
Richard Littauer
d718c438ee Removed second force-push section 
This commit was in #18, first.
 2015-03-20 20:39:57 +08:00
Richard Littauer
17dea4c558 Merge pull request #49 from RichardLitt/master 
Doctoc fixes. :|
 2015-03-16 13:18:55 -07:00
Richard Littauer
974505558f Doctoc fixes. :| 2015-03-16 13:18:19 -07:00
Richard Littauer
6f9d0f8797 Merge pull request #48 from RichardLitt/gitter-badger-gitter-badge 
Gitter
 2015-03-16 13:15:04 -07:00
Richard Littauer
fed9948810 Merge branch 'gitter-badge' of https://github.com/gitter-badger/git-flight-rules into gitter-badger-gitter-badge 2015-03-16 13:14:01 -07:00
Richard Littauer
a9bfc9f52a Merge pull request #47 from RichardLitt/master 
PR Feedback
 2015-03-16 13:10:29 -07:00
Richard Littauer
d5d405fbbf Merge branch 'camwes-patch-1' 2015-03-16 13:09:56 -07:00
Richard Littauer
c108121f94 Doctoc 2015-03-16 13:09:41 -07:00
Richard Littauer
fc5d15e54c Merge branch 'patch-1' of https://github.com/camwes/git-flight-rules into camwes-patch-1 2015-03-16 13:09:15 -07:00
Cameron Drake
88252b2d91 PR feedback 2015-03-16 12:15:05 -07:00
Richard Littauer
b1016fbeb9 Merge pull request #46 from RichardLitt/master 
Merge Josh dutcher
 2015-03-16 10:21:17 -07:00