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
Richard Littauer
0ecf651254
Doctoc, closes #35
2015-03-16 10:20:18 -07:00
Richard Littauer
a52d5152d8
Merge branch 'joshdutcher-master'
2015-03-16 10:20:05 -07:00
Richard Littauer
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
Josh Dutcher
ea87639b03
added 'pulled from/into the wrong branch'
2015-03-16 12:11:41 -05:00
Richard Littauer
0e64bc4cb5
Merge pull request #45 from RichardLitt/master
...
Moved doctoc
2015-03-16 09:33:56 -07:00
Richard Littauer
49c3e94217
Moved doctoc
2015-03-16 09:33:13 -07:00
Richard Littauer
80854f6e60
Alignment
...
We're going to have to keep tabs on this, doesn't seem perfect.
2015-03-16 09:22:16 -07:00
Richard Littauer
50bf10c986
Merge pull request #44 from RichardLitt/master
...
Moved header
2015-03-16 09:21:27 -07:00
Richard Littauer
c8e0049af6
Moved header
2015-03-16 09:20:51 -07:00
Richard Littauer
108aa058f0
Merge pull request #38 from RichardLitt/toc
...
Added TOC using npm module doctoc
2015-03-16 09:19:25 -07:00
Richard Littauer
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
The Gitter Badger
92211c458f
Added Gitter badge
2015-03-14 18:51:22 +00:00
Richard Littauer
19c8ad3ab9
Added then
...
This makes it clear that `git rebase` is not a check to see if master is up to date. #3
2015-03-14 11:06:23 -07:00
Richard Littauer
a2d407f12e
Merge pull request #42 from RichardLitt/git-commit-wrong-branch-33
...
Added note about git push
2015-03-14 10:26:29 -07:00
Richard Littauer
34e4f3e39b
Added note about git push
...
This reflects that your origin will be out of sync with remote if you reset. Just a small note. I noticed this when testing #33
2015-03-14 10:25:34 -07:00
Kate Hudson
660a9b59ca
Merge pull request #28 from unixorn/add-missing-anchor-tag
...
Add missing anchor tag
2015-03-13 18:01:23 -04:00
Joe Block
7ad2b8db96
Merge remote-tracking branch 'upstream/master' into add-missing-anchor-tag
2015-03-13 14:03:03 -07:00
Kate Hudson
1ddfc1707d
Merge pull request #41 from k88hudson/circosta
...
fixes typo
2015-03-13 15:00:18 -04:00
Ciro S. Costa
3786c8832d
fixes typo
2015-03-13 14:58:57 -04:00
Kate Hudson
4f85cb543b
Merge pull request #27 from unixorn/adding-custom-aliases
...
Add example of making command aliases.
2015-03-13 14:50:14 -04:00
