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
232 Commits 6 Branches 0 Tags 1.7 MiB
Commit Graph

164 Commits

Author SHA1 Message Date
Kai Dalgleish b244c00a4e Add Note About --ours and --theirs (#133) 
* add note about --ours and --theirs

* correct error message, add more detail on ours/theirs
 2017-11-14 14:36:22 -05:00
Simon Vocella fc459528ea Revert a file to a specific revision (#131) 2017-11-13 09:09:15 -05:00
Richard Littauer a38b385b03 Merge branch 'toptal-more-specific-removal-of-a-file-from-commit' 2017-11-12 10:31:53 -05:00
Richard Littauer 186ed0a1e4 docs: small grammar fix 2017-11-12 10:31:50 -05:00
Filipp Pirozhkov f60cd9d835 Change command to avoid editing commit message 2017-11-12 18:16:13 +03:00
Tom V 103e920531 Add fetching a GitHub PR ref directly (#129) 2017-11-12 08:10:33 -05:00
Gabriel Caruso e2ddb7fe55 Added how to rename a local branch (#128) 2017-11-11 09:11:26 -05:00
Nick Kirby 4547f3ea98 Add git extensions to GUI Clients 2017-11-10 16:50:28 -05:00
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