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
92211c458f
Added Gitter badge
2015-03-14 18:51:22 +00:00
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
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
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
660a9b59ca
Merge pull request #28 from unixorn/add-missing-anchor-tag
...
Add missing anchor tag
2015-03-13 18:01:23 -04:00
7ad2b8db96
Merge remote-tracking branch 'upstream/master' into add-missing-anchor-tag
2015-03-13 14:03:03 -07:00
1ddfc1707d
Merge pull request #41 from k88hudson/circosta
...
fixes typo
2015-03-13 15:00:18 -04:00
3786c8832d
fixes typo
2015-03-13 14:58:57 -04:00
4f85cb543b
Merge pull request #27 from unixorn/adding-custom-aliases
...
Add example of making command aliases.
2015-03-13 14:50:14 -04:00
87ee391bf1
Merge pull request #29 from unixorn/cleanup-deleted-branches
...
Add instructions for deleting stale branches
2015-03-13 11:36:31 -07:00
c554b2b993
Merge pull request #31 from RichardLitt/force
...
Add stronger language for force push
2015-03-13 14:35:11 -04:00
46c5192659
Merge pull request #34 from Trevoke/patch-1
...
Fix typo
2015-03-13 11:30:06 -07:00
8ee6b388af
Merge pull request #39 from RichardLitt/git-commit-amend
...
Added commit amend simple message
2015-03-13 14:29:23 -04:00
e575e47aaa
Added commit amend simple message
2015-03-07 10:39:30 -08:00
0a2f618d0f
Add a few recipes
2014-11-30 17:21:34 -08:00
177d178c50
Fix typo
2014-11-04 11:52:05 -05:00
0ed6dbf706
Remove typo aliases, add co = checkout
2014-08-29 14:37:42 -07:00
9d45f6a273
Add stronger language for force push
...
It will conflicts in the source history, and may interfere with other branches regardless of amount of developers on the team.
2014-08-27 23:02:00 -07:00
a4a708b9df
Add missing anchor tag
2014-08-22 14:08:27 -07:00
cf111f959c
Add instructions for deleting stale branches
2014-08-22 14:07:36 -07:00
9fba446438
Add example - unpushed aliases to log @{u}
2014-08-22 13:53:19 -07:00
8d2c660b3c
Add some command aliases.
2014-08-22 13:33:56 -07:00
fc2ec9c64a
Merge pull request #21 from jwhear/master
...
Use `branch` instead of `checkout -b`
2014-08-22 14:55:09 -04:00
0b5b0762e3
Merge pull request #19 from sconklin/master
...
add instructions for changing the author of the last commit
2014-08-22 14:54:38 -04:00
b3cbdcc589
Merge pull request #14 from unixorn/show-rebasing-unpushed-commits
...
Add entry for safe rebasing of unpushed commits
2014-08-22 14:52:34 -04:00
2566992128
Merge pull request #24 from robins/master
...
Correct typo - Situations
2014-08-22 14:51:57 -04:00
44ca1a7885
Merge pull request #25 from opinxit/push-f
...
avoid force pushing
2014-08-22 14:51:43 -04:00
e001f275ae
avoid force pushing
2014-08-19 14:48:43 -04:00
9b88f428a4
-add section for reflog
2014-08-18 13:28:16 -07:00
722787c17b
Merge pull request #13 from siemiatj/master
...
Add section about reflog
2014-08-14 19:52:50 -07:00
e7310f3cff
Correct typo - Situations
...
Correct typo - Situations (not Sitautions)
2014-08-15 06:04:50 +05:30
a53267fd27
Add "I need to undo my last commit"
2014-08-14 12:01:43 -07:00
abb085de05
Add "Oh crap, what did I just commit"
2014-08-14 11:46:47 -07:00
951e37cc2e
Use branch instead of checkout -b
...
Using `checkout -b` to create a new branch only to immediately checkout the previous branch is kind of pointless.
2014-08-14 10:41:04 -07:00
1b8e378cf4
add instructions for changing the author of the last commit
2014-08-07 07:41:35 -05:00
