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
d718c438ee
Removed second force-push section
...
This commit was in #18 , first.
2015-03-20 20:39:57 +08:00
Richard Littauer
974505558f
Doctoc fixes. :|
2015-03-16 13:18:19 -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
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
0ecf651254
Doctoc, closes #35
2015-03-16 10:20:18 -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
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
c8e0049af6
Moved header
2015-03-16 09:20:51 -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
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
Joe Block
7ad2b8db96
Merge remote-tracking branch 'upstream/master' into add-missing-anchor-tag
2015-03-13 14:03:03 -07: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
Richard Littauer
87ee391bf1
Merge pull request #29 from unixorn/cleanup-deleted-branches
...
Add instructions for deleting stale branches
2015-03-13 11:36:31 -07:00
Kate Hudson
c554b2b993
Merge pull request #31 from RichardLitt/force
...
Add stronger language for force push
2015-03-13 14:35:11 -04:00
Richard Littauer
46c5192659
Merge pull request #34 from Trevoke/patch-1
...
Fix typo
2015-03-13 11:30:06 -07:00
Richard Littauer
e575e47aaa
Added commit amend simple message
2015-03-07 10:39:30 -08:00
Aldric Giacomoni
177d178c50
Fix typo
2014-11-04 11:52:05 -05:00
Joe Block
0ed6dbf706
Remove typo aliases, add co = checkout
2014-08-29 14:37:42 -07:00
Richard Littauer
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
Joe Block
a4a708b9df
Add missing anchor tag
2014-08-22 14:08:27 -07:00
Joe Block
cf111f959c
Add instructions for deleting stale branches
2014-08-22 14:07:36 -07:00
Joe Block
9fba446438
Add example - unpushed aliases to log @{u}
2014-08-22 13:53:19 -07:00
Joe Block
8d2c660b3c
Add some command aliases.
2014-08-22 13:33:56 -07:00
Kate Hudson
fc2ec9c64a
Merge pull request #21 from jwhear/master
...
Use `branch` instead of `checkout -b`
2014-08-22 14:55:09 -04:00
Kate Hudson
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
Kate Hudson
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
Kate Hudson
2566992128
Merge pull request #24 from robins/master
...
Correct typo - Situations
2014-08-22 14:51:57 -04:00
Chris O'Connor
e001f275ae
avoid force pushing
2014-08-19 14:48:43 -04:00
siemiatj
9b88f428a4
-add section for reflog
2014-08-18 13:28:16 -07:00
Robins
e7310f3cff
Correct typo - Situations
...
Correct typo - Situations (not Sitautions)
2014-08-15 06:04:50 +05:30
Justin Whear
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
Steve Conklin
1b8e378cf4
add instructions for changing the author of the last commit
2014-08-07 07:41:35 -05:00
Christophe Naud-Dulude
6526fc148f
Fix typo
2014-08-05 13:39:03 -07:00
Jason Moore
9f20e13e41
fix prompt to match style guide
2014-07-31 23:21:46 -04:00
Jason Moore
36b4aadc11
add 4 tips
2014-07-31 23:16:43 -04:00
siemiatj
3399886f03
-add section for reflog
2014-07-31 17:19:49 +02:00
Christophe Naud-Dulude
7131d015d0
Fix typo
2014-07-30 14:59:12 -07:00
Joe Block
f160a96ef6
Add entry for safe rebasing of unpushed commits
2014-07-30 14:57:27 -07:00
Jack Maney
2a01c08c37
Merged #7 with upstream
2014-07-29 17:54:47 -05:00
Cameron Drake
978e484967
Update README.md
2014-07-29 11:53:00 -07:00
Kate Hudson
69204cdf0a
Fixes #6 : Force pushing after amending commits
2014-07-29 13:14:46 -04:00
Jack Maney
3e6efe1c7e
Added anchor points to sections.
...
Added anchor points so that links can be created to the merge conflict section, etc.
2014-07-29 11:44:39 -05:00
