mirrors/git-flight-rules
mirrors
/
git-flight-rules
mirror of https://github.com/k88hudson/git-flight-rules.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
287 Commits 6 Branches 0 Tags 1.7 MiB
Commit Graph

206 Commits

Author SHA1 Message Date
Raimon Grau (rgrau) 17bf6d7cbd Add Magit (#126) 2017-11-10 16:30:45 -05:00
Nick Kirby 76361c407f Fix minor typo (#124) 2017-11-10 16:04:58 -05:00
Filipp Pirozhkov 545a53e808 Change the command to minimize side effects 2017-11-10 19:18:27 +03:00
Bence Dányi 9f0a1d2ae3 Recommend --force-with-lease instead of --force (#117) 2017-11-07 09:19:44 -05:00
Edgar Hipp 4a654bd90a Add Tig to the list of clients (#116) 
* Update README.md

* Update README.md
 2017-11-07 07:58:24 -05:00
Arnav Borborah 7f2a4bfd03
Minor text update 2017-11-06 20:09:42 -05:00
Shaya Cohen 1883097a8b add learngitbranching tutorial 2017-11-06 19:22:35 -05:00
Shaya Cohen 20bb62b971
Add another git book 2017-11-06 18:25:54 -05:00
Richard Littauer 868005ed17
Merge pull request #109 from e-larrambebere/master 
Fixes minor style issues
 2017-11-06 08:42:43 -05:00
Emilio Larrambebere 051e40b042 Fixes minor style issues 
Adds some missing closure tags to the section anchors. This was causing some issues rendering the README
 2017-11-06 09:12:56 +00:00
thomasyimgit 485bcf6691 add checkout to remote branch 2017-11-05 21:02:03 -05:00
Richard Littauer 2a86ef478e Merge branch 'pr/106' 2017-06-05 12:08:59 +01:00
Richard Littauer 51d78e43c5 Adding stashes back in 2017-06-05 12:08:56 +01:00
Richard Littauer 998dd0c7fb Add git-town, alphabetize 2017-05-24 14:50:55 +01:00
Peter Dave Hello 542884da13 Improve "discard specific unstaged changes" steps 2017-04-09 16:20:44 +08:00
plsr 5af92eed17 Use 'branch' instead of 'checkout -b' 2017-03-29 11:55:42 +02:00
Camilo Ramirez 36c28e5ec2 Add Git Gui Cloent GitKraken 2017-01-11 16:46:43 -05:00
Richard Littauer 1cb8a5798f Merge pull request #102 from gaetan-petit/patch-1 
ADD undo rebase/merge
 2017-01-09 21:10:44 +01:00
Gaëtan Petit 5bad85aeba Update README.md 2017-01-08 00:32:15 +01:00
Richard Littauer c89b20a3fe Merge pull request #101 from k88hudson/feat/staging-the-unstaged 
Added section on staging and unstaging
 2017-01-06 23:49:40 +01:00
Carson Wilcox eb48bfc8ba add a new rule, how to discard specific unstaged changes 2016-12-29 15:34:11 -05:00
Gaëtan Petit 9478da7964 Update README.md 2016-12-21 17:43:59 +01:00
Gaëtan Petit 2b34d20485 ADD undo rebase/merge 
Please correct my broken english :)
 2016-12-21 17:42:00 +01:00
Richard Littauer 57b67d4843 Added section on staging and unstaging 2016-12-13 13:03:57 -05:00
Richard Littauer 25bb25a82f Merge pull request #99 from jwilk/spelling 
Fix typos
 2016-11-13 20:30:03 +09:00
Jakub Wilk c483f0dfda Fix the "amend" alias 2016-11-12 16:11:50 +01:00
Jakub Wilk 4744ae8733 Fix typos 2016-11-12 16:10:29 +01:00
Richard Littauer 2fa0b60933 Moved note to section 2016-08-01 21:20:33 -04:00
Alvaro Garcia 6d0c8e4910 Add rule about bringing changes from another ref-ish 2016-08-01 21:18:59 -04:00
Richard Littauer abaa08d04a Update ToC 2016-08-01 21:08:05 -04:00
Richard Littauer bc09d52f9c Merge pull request #93 from eush77/additions 
Add some simpler ways to do the same things
 2016-02-22 10:13:47 -05:00
Eugene Sharygin 15fe42de67 add missing preposition 2016-02-22 17:54:12 +03:00
Richard Littauer d87d89abfb Merge pull request #94 from alvarogarcia7/patch-1 
add another way of seeing the last committed diff
 2016-02-15 12:56:47 -05:00
Richard Littauer aef9e07efc Merge pull request #95 from alvarogarcia7/patch-2 
prefer using official (bogus) domain name
 2016-02-15 12:55:57 -05:00
Alvaro Garcia f852094458 for privacy, hide emails 2016-02-15 00:45:06 +01:00
Alvaro Garcia 8ebbb29f48 prefer using official (bogus) domain name 2016-02-15 00:43:35 +01:00
Alvaro Garcia 35715611d4 add another way of seeing the last committed diff 2016-02-15 00:38:20 +01:00
Eugene Sharygin 7c76618f2e add some simpler ways to do the same things and a bit more info 2016-02-13 01:13:36 +03:00
Amir Djavaherian 70077dbe9f Adding a rule for caching username and password 
This describes how you can cache your username and password with credential helper. ala. https://help.github.com/articles/caching-your-github-password-in-git/
 2015-12-17 12:52:19 -08:00
Richard Littauer 8e4d72dbc8 Added git fire 
🔥
 2015-10-05 10:40:27 -04:00
Ricardo Magalhães 4dbc241226 Merge branch 'recover-deleted-tag' of https://github.com/magalhini/git-flight-rules into magalhini-recover-deleted-tag 2015-10-02 08:54:13 -04:00
orthographic-pedant 792e0deb23 Fixed typographical error, changed accidentaly to accidentally in README. 2015-09-30 13:11:12 -04:00
Richard Littauer 01eddd2ca7 Restructured document, closes #62 2015-09-27 11:45:45 -04:00
Ricardo Magalhães 0bd7dbd106 Consistent naming of tags. 2015-09-27 17:35:43 +02:00
Ricardo Magalhães 6fa3e0c7d9 Add instructions to recover a deleted tag. 2015-09-27 17:28:04 +02:00
Richard Littauer 1edbba171b Added workflow for removing file from commit 2015-09-23 11:42:36 -04:00
Bo-Yi Wu cb168abd45 update comment. 2015-09-04 10:32:37 +08:00
Bo-Yi Wu 184bcc1ddf Add another way to change commit message. 2015-09-04 08:55:25 +08:00
Kate Hudson d417eedd3b Merge pull request #77 from RichardLitt/feature/edit-amend 
Added more text to amend section to explain when it is good to edit a…
 2015-09-03 16:07:37 -04:00
Kate Hudson 65e60c8e89 Merge pull request #79 from RichardLitt/feature/delete-branch 
Added explanation for deleting a branch
 2015-09-03 16:05:04 -04:00
Richard Littauer 1798a7d4c0 Added explanation for deleting a branch 2015-09-03 15:56:51 -04:00
Kate Hudson 5b935d5597 Merge pull request #80 from RichardLitt/feature/reset-single-file 
Added explanation for reseting a single file
 2015-09-03 15:56:49 -04:00
Kate Hudson 6f8ab94610 Merge pull request #81 from RichardLitt/feature/standardize-syntax 
Standardized branch names to my-branch, added missing dollar signs, a…
 2015-09-03 15:50:43 -04:00
Kate Hudson 21fca93ac2 Merge pull request #82 from RichardLitt/feature/add-gitup 
Added GitUp into resources
 2015-09-03 15:39:05 -04:00
Richard Littauer 11cf3c92de Merge pull request #83 from RichardLitt/feature/github-workflow 
Added GitHub as a workflow
 2015-08-25 14:53:15 -04:00
Richard Littauer 927ca07ff8 Added a section about reflog, closes #2 2015-08-25 14:37:06 -04:00
Richard Littauer 50780dc043 Added GitHub as a workflow 2015-08-25 14:27:12 -04:00
Richard Littauer 97cada4381 Added GitUp into resources 2015-08-20 12:09:59 -04:00
Richard Littauer 48cce8af6c Standardized branch names to my-branch, added missing dollar signs, and fixed some cases where the order wasn't right. Also added sh to all code blocks where needed, and added `vim` to blocks showing the interactive editor. This closes #76. 2015-08-19 13:48:42 -04:00
Richard Littauer eb73619120 Added explanation for reseting a single file 2015-08-18 16:03:44 -04:00
Richard Littauer a9cb62514a Merged two questions, as revert applies to both 2015-08-18 15:57:09 -04:00
Richard Littauer 6722c72350 Added more text to amend section to explain when it is good to edit a commit 2015-08-18 15:53:51 -04:00
Richard Littauer ca934fe3ff Added example for changing capitalization of a file 2015-08-18 11:11:17 -04:00
Richard Littauer a1adec8fe4 Add solution for interactively patching part of a new file 2015-08-09 15:20:45 -04:00
Richard Littauer 3260154b76 Added git tips 2015-07-16 14:16:06 -04:00
Bo-Yi Wu 8434388e49 Add GIT utilities 2015-07-16 20:05:27 +08:00
Richard Littauer 1bb6a708ec How to undo a hard reset 2015-07-03 16:22:51 -04:00
Richard Littauer cdef6a1274 Merged two answers 2015-07-03 16:20:02 -04:00
Richard Littauer 875c49d0d1 Added good rebase and merge tutorial 2015-06-30 13:29:52 -04:00
Richard Littauer 84d543db7d Added note about checking for merged branches 
This should check if your commits are fully merged or not. Mostly taken from
http://stackoverflow.com/questions/7548926/git-and-the-branch-x-is-not-fully-merged-error.
 2015-06-01 09:47:33 +08:00
Joe Block 7792dac8f7 Doctoc update 2015-05-24 22:35:52 -07:00
Joe Block 34a83f3efa Add GUI Clients section 2015-05-24 22:35:34 -07:00
Joe Block a02899c748 Add Tower client 2015-05-24 22:26:56 -07:00
Richard Littauer a3e2e70fa1 Fixed header 2015-05-22 09:26:54 +07:00
Richard Littauer b8bb75da0f Added firstaidgit.io 
Closes #54.
 2015-05-22 09:14:45 +07:00
Joe Block 45c63ac9f4 Add book section 2015-05-21 19:02:08 -07:00
Joe Block ff99d75be1 Add git-cola 2015-05-21 19:00:08 -07:00
Joe Block 44ebb19dbb Add gitx-dev link 2015-05-21 18:58:21 -07:00
Joe Block 67ed4f0ea5 Forgot to run doctoc after adding 'Other Resources' section 2015-05-19 10:52:56 -07:00
Joe Block 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
Joe Block a9b0361a88 Strip trailing spaces 2015-05-19 10:40:03 -07:00
Richard Littauer 1b4cad1552 Added a section about deleted PRs 2015-05-19 14:23:25 +07:00
Richard Littauer b0c20c4804 Added explanation of HEAD, kept past example 2015-05-19 14:13:19 +07:00
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