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
102 Commits 6 Branches 0 Tags
Commit Graph

73 Commits

Author SHA1 Message Date
Arialdo Martini
6a23217314 Using git reset --hard HEAD^, as suggested by @konrado0905 2015-05-19 14:11:34 +07:00
Richard Littauer
d673566e0d Rebasing and force pushing 2015-05-15 13:24:00 +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
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
bec92700e4 Merge 2015-04-26 18:18:50 +08:00
Joe Block
ab17fbc6ab Minor typo fix, remove trailing spaces 2015-04-20 23:39:46 -07: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
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
Dan Dascalescu
0a2f618d0f Add a few recipes 2014-11-30 17:21:34 -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
Stuart P. Bentley
a53267fd27 Add "I need to undo my last commit" 2014-08-14 12:01:43 -07:00
Stuart P. Bentley
abb085de05 Add "Oh crap, what did I just commit" 2014-08-14 11:46:47 -07:00