f9b72fe495
Added firstaidgit.io
...
Closes #54 .
2015-05-20 00:47:29 +07:00
efb1619f25
Merge pull request #64 from unixorn/master
...
Add "Other Resources" section
2015-05-20 00:45:32 +07:00
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
a9b0361a88
Strip trailing spaces
2015-05-19 10:40:03 -07:00
264d3dde33
Merge pull request #61 from RichardLitt/feature/deleted-fork
...
Added a section about deleted PRs
2015-05-20 00:19:46 +07:00
1b4cad1552
Added a section about deleted PRs
2015-05-19 14:23:25 +07:00
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
b0c20c4804
Added explanation of HEAD, kept past example
2015-05-19 14:13:19 +07:00
6a23217314
Using git reset --hard HEAD^, as suggested by @konrado0905
2015-05-19 14:11:34 +07:00
e4fe866e14
Merge pull request #56 from RichardLitt/force-push-rebase
...
Rebasing and force pushing
2015-05-16 01:37:47 +07:00
d673566e0d
Rebasing and force pushing
2015-05-15 13:24:00 +07:00
08bbf9a967
Merge pull request #58 from RichardLitt/master
...
Merge stuartpb-patch-2
2015-05-15 13:21:03 +07:00
a32ec5590e
Merge branch 'stuartpb-patch-2'
2015-05-15 13:20:02 +07:00
1a993cec3e
Added text, moved to appropriate section
2015-05-15 13:19:52 +07:00
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
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
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
0f7027159a
Merge pull request #55 from RichardLitt/master
...
Merge
2015-04-26 18:19:47 +08:00
8c5b442718
Merge branch 'stuartpb-patch-1'
2015-04-26 18:19:00 +08:00
bec92700e4
Merge
2015-04-26 18:18:50 +08:00
2ebceca748
Merge pull request #53 from unixorn/master
...
Minor typo fix, remove trailing spaces
2015-04-21 14:31:46 +07:00
ab17fbc6ab
Minor typo fix, remove trailing spaces
2015-04-20 23:39:46 -07:00
597bde6d7b
Merge pull request #52 from RichardLitt/master
...
Merged in the Delete PR
2015-03-23 11:17:34 +08:00
caf8d3c8b4
Made a deleting category
2015-03-23 11:15:55 +08:00
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
2bf72a4ec4
Merge pull request #51 from RichardLitt/master
...
RM tips
2015-03-21 10:16:18 +08:00
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
0fe348620e
Merge pull request #50 from RichardLitt/master
...
Removed second force-push section
2015-03-20 20:42:15 +08:00
d718c438ee
Removed second force-push section
...
This commit was in #18 , first.
2015-03-20 20:39:57 +08:00
17dea4c558
Merge pull request #49 from RichardLitt/master
...
Doctoc fixes. :|
2015-03-16 13:18:55 -07:00
974505558f
Doctoc fixes. :|
2015-03-16 13:18:19 -07:00
6f9d0f8797
Merge pull request #48 from RichardLitt/gitter-badger-gitter-badge
...
Gitter
2015-03-16 13:15:04 -07:00
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
a9bfc9f52a
Merge pull request #47 from RichardLitt/master
...
PR Feedback
2015-03-16 13:10:29 -07:00
d5d405fbbf
Merge branch 'camwes-patch-1'
2015-03-16 13:09:56 -07:00
c108121f94
Doctoc
2015-03-16 13:09:41 -07:00
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
88252b2d91
PR feedback
2015-03-16 12:15:05 -07:00
b1016fbeb9
Merge pull request #46 from RichardLitt/master
...
Merge Josh dutcher
2015-03-16 10:21:17 -07:00
0ecf651254
Doctoc, closes #35
2015-03-16 10:20:18 -07:00
a52d5152d8
Merge branch 'joshdutcher-master'
2015-03-16 10:20:05 -07:00
5b0a37cfdd
Merge branch 'master' of https://github.com/joshdutcher/git-flight-rules into joshdutcher-master
...
# Conflicts:
# README.md
2015-03-16 10:19:49 -07:00
ea87639b03
added 'pulled from/into the wrong branch'
2015-03-16 12:11:41 -05:00
0e64bc4cb5
Merge pull request #45 from RichardLitt/master
...
Moved doctoc
2015-03-16 09:33:56 -07:00
49c3e94217
Moved doctoc
2015-03-16 09:33:13 -07:00
80854f6e60
Alignment
...
We're going to have to keep tabs on this, doesn't seem perfect.
2015-03-16 09:22:16 -07:00
50bf10c986
Merge pull request #44 from RichardLitt/master
...
Moved header
2015-03-16 09:21:27 -07:00
c8e0049af6
Moved header
2015-03-16 09:20:51 -07:00
108aa058f0
Merge pull request #38 from RichardLitt/toc
...
Added TOC using npm module doctoc
2015-03-16 09:19:25 -07:00
5b6dfb05c9
Added TOC using npm module doctoc
...
This should automatically update. All it takes on the maintainer's end
is to `npm install -g doctoc`, and run it once in the file. I like
the look of it, and I think this solves the issue in one command nicely.
This is made to deal with #10 .
2015-03-16 09:18:49 -07:00
Richard Littauer
Joe Block
Arialdo Martini
Cameron Drake
Josh Dutcher