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

358 Commits

Author SHA1 Message Date
Timo Sand d4cf0fb88a Allows SSL errors in links (#265) 
Fixes #264
 2019-01-30 10:11:55 +02:00
Tommy Williams 8e697833ae Add shortcuts information for Windows PowerShell (#263) 2018-12-11 12:29:13 -05:00
Richard Littauer 73547ca942
Add pcottle/learnGitBranching (#262) 2018-12-06 14:12:33 -05:00
abdel ali 3d6c00dded Git shortcuts (#261) 
* I committed and pushed a merge that shouldn't have happened

* git shortcuts

* remove extra commands in git shortcut section
 2018-12-06 14:12:13 -05:00
Richard Littauer 8b09e3fb58 Slight wording changes 2018-12-06 09:55:45 -05:00
nielsonm 5cfcca513c Add section on `reset -p` to unstage edits 
Expanded  explanation & corrected bad grammar.
 2018-12-06 09:55:42 -05:00
Richard Littauer b67b184d8a Merge branch 'nzachow-master' 2018-11-29 14:17:40 -05:00
Richard Littauer ee10f43326 Adding a period. 2018-11-29 14:17:35 -05:00
Richard Littauer 0d109a7f9c Merge branch 'm007-master' 2018-11-29 14:12:12 -05:00
Richard Littauer 1877d108b0 Small wording changes 2018-11-29 14:12:07 -05:00
Matthias Baumgarten 42b5519891 Wording improvements due to review comments 
Like discussed in the PR this commit improves the quested section
regarding lesser spelling mistakes and improved wording. The discussion
about --no-edit lead to no changes required, so it is not altered.

See https://github.com/k88hudson/git-flight-rules/pull/256
 2018-11-29 20:00:27 +01:00
Timo Sand 9d16c95ee1 Adds a few useful git aliases (#258) 
Addresses #225
 2018-11-29 11:28:21 -05:00
Sylvain Abélard c9cfb71843 README_fr.md - replacing weird characters (#259) 
Thanks for the translation!
 2018-11-29 11:26:58 -05:00
Richard Littauer 4b5cad207a Use npm scripts for travis commands 2018-11-28 09:07:46 -05:00
Richard Littauer db69499594 Ran doctoc again 2018-11-28 09:07:38 -05:00
Richard Littauer 7cb8c1a105 Merge branch 'grantslone-master' 2018-11-28 08:56:04 -05:00
Richard Littauer bbcb8f6704 Small grammar edits 2018-11-28 08:56:01 -05:00
Richard Littauer 8854c326b9 Merge branch 'retiform-master' 2018-11-28 08:48:05 -05:00
Richard Littauer d6e98fd537 Small spelling and style changes 2018-11-28 08:47:50 -05:00
Cole bd388a89c5
Update README.md 2018-11-27 23:01:22 -05:00
Cole ca49abe067
Update README.md 2018-11-27 23:00:21 -05:00
Cole 8809567e7a
Update README.md 2018-11-27 22:59:54 -05:00
Cole 9b54d14dff
Update README.md 2018-11-27 22:57:52 -05:00
Cole 066cf428e1
Update README.md 2018-11-27 22:56:06 -05:00
Samy Kacimi a3ece44263 add french (fr) translation (#252) 2018-11-27 14:43:27 -05:00
Jay Two 911089c406 Update README_kr.md (#257) 
edit typo 🇰🇷
 2018-11-27 12:12:13 -05:00
Matthias Baumgarten ebfe5dae13 Add section on how to modify an arbitrary commit 
Explain how to solve situations where you want to modify a commit which
is not your last by using interactive rebase.
 2018-11-20 18:16:58 +01:00
cyblue9 4b6e19a5ea Fix typo (#254) 2018-11-14 18:28:44 -05:00
cyblue9 f4037ec5c1 Fix option to amend commit message (#255) 2018-11-14 18:28:28 -05:00
Richard Littauer 20e4b2c10d Merge branch 'hoannc54-master' 2018-11-14 07:42:46 -05:00
hoannc 23e4b8d4f3 run doctoc 2018-11-14 07:42:26 -05:00
hoannc bd9af24828 update 2018-11-14 01:47:05 +07:00
hoannc bbbead4bcd add test 2 2018-11-12 23:52:23 +07:00
hoannc 065ce6e742 add test 2018-11-12 23:48:53 +07:00
hoannc 9d11cb4e9b update git readme vi 2018-11-12 22:57:45 +07:00
hoannc 2e8a756862 update git 2018-11-11 00:09:55 +07:00
yongsun-park 4e96f71c28 Fix typo in README_kr.md (#251) 
글로버 -> 글로벌
 2018-11-08 10:45:18 -05:00
joseph ba88c82f94 added a section for unstaging a staged file. (#243) 
I have accidentally staged many files in my working copy, and was looking for a way to unstage them by filename as I had some staged files that I wanted to keep. Didn't see anything that addressed my specific issue on the README, so thought of adding it here.
 2018-11-04 16:35:56 -05:00
Moisés Ñañez 9e15db0d59 Update spanish README (#246) 2018-11-01 16:04:04 -04:00
Artem Buslov 57c4e3bc59 Corrected link label in the TOC for fixing Travis-CI (#239) 2018-10-30 04:20:29 -04:00
Cam Hardy 913e8285aa Update readme en (#242) 
* added guide for amending sensitive data that was committed/pushed

* added formatting and more solutions for amending sensitive data

* added a few sentences to explain why any sensitive data should be considered compromised once it's been committed
 2018-10-30 04:19:23 -04:00
Artem Buslov 9102de6186 Update Russian translation (#240) 2018-10-26 14:03:55 +02:00
Jake efb35a9607 Telling Git to ignore a local change without unversioning the file (#219) 
Ignoring local changes can be really handy for creds/credfile templates, I've found it particularly handy with Discord bot development where the configuration file can have an expected structure and expects you to add tokens to that config file
 2018-10-24 19:15:19 +02:00
Henry Darnell c767e4b22a Add rebase --onto details (#231) 2018-10-24 10:09:06 +02:00
Dakota Chambers f8257b615b Add guide to fix refspec multiple match error (#223) 
* Add guide to working with tags and branches that share the same name.

Add the error scene when trying to push a tag/branch that share the same name and the commands to fix that problem.

* Fix formatting of an error statement.
 2018-10-24 10:04:59 +02:00
Matthieu V 8f4ec811b3 Added SublimeMerge client (#221) 
Creators of Sublime Text recently launched a Git client, it has a lot of potential !

I think it has its place in this list 😃 

Please tell me if my phrasing is wrong
 2018-10-23 17:02:23 +02:00
mnpk 3339385cdb Fix typo in README_kr.md (#228) 
* Fix typo in README_kr.md

fix following typo in korean readme:

Mecury -> Mercury
꺼에요 -> 거에요
꺼구요 -> 거구요
썻어 -> 썼어
썻고 -> 썼고
텍스트르 에디터 -> 텍스트 에디터
리에비스 -> 리베이스
쓼 수 -> 쓸 수
때떄로 -> 때때로
받을려면 -> 받으려면

* Update Doctoc ToC
 2018-10-23 14:44:00 +02:00
Richard Littauer 02d9745c00
Add note about Git version (#217) 
See #216. @ramiro how does this look?
 2018-10-23 14:43:49 +02:00
Ricardo Lopes 965b320695 Add more resources to the list (#227) 
* Add more tutorials to the list

* Add another book to the list
 2018-10-23 14:42:23 +02:00
Victorhck 661024bc32 Fix links markdown formats in Spanish translation (#220) 2018-10-23 14:26:08 +02:00