1
0
mirror of https://github.com/k88hudson/git-flight-rules.git synced 2025-03-10 12:48:43 -03:00

276 Commits

Author SHA1 Message Date
Viet Than
7caa59575b
Update Vietnamese translations (#318) 2021-06-25 12:29:37 -04:00
Rui Bastos
5816815453
New rule: split a branch into two (#314) 2021-03-18 08:42:18 -04:00
Richard Littauer
9e1faad0e9 chore: Update ToC 2021-02-25 09:16:54 -05:00
Bastian Venthur
ef15b6cd8b
Removed hint configure color.ui auto: (#311)
color.ui defaults to "auto" since git version 1.8.4 from August 2013
(https://github.com/git/git/releases/tag/v1.8.4) so it is probably not
needed to set this option anymore.
2021-01-26 12:47:47 -05:00
Shota Ray Imaki
fa148da698
Replace master with main (issue/#308) (#309) 2020-12-01 09:44:45 -05:00
CEUK
82f0b3994d
add patch workflow to sharing code section (#307) 2020-11-28 16:15:14 -05:00
Richard Littauer
cfca81c274 Adding 日本語 to all of the lists 2020-04-30 17:01:35 -04:00
Abhishek Kumar
76308321b0 add note on updating remote branch name (#290)
* add note on updating remote branch name

* Style edits.
2019-11-11 07:50:37 -05:00
KarthikSiddarth
bce2f0dd27 Note/git add u (#287)
* add note about 'git add -u '

* run doctoc

* add note about copying folder

* add space b/w -- and folder name

also mention, this can be done for files

* add 'file' in the title

* add node on using pathspec

* run doctoc

* fix small errors

* run doctoc

* remove 'my-branch' text
2019-10-30 08:38:19 -04:00
KarthikSiddarth
f0b433773f add note about copying folder (#289)
* add note about copying folder

* add space b/w -- and folder name

also mention, this can be done for files

* add 'file' in the title
2019-10-20 13:38:02 +02:00
Richard Littauer
40a542d31a English language edits 2019-09-30 08:50:18 -04:00
yaame
f1a2195372 add note about git stash pop --index 0 2019-09-20 05:43:05 +00:00
yaame
4252773598 fix git stash push 2019-09-12 01:12:30 +00:00
yaame
260a140bda fix case: switch stage & unstage files 2019-09-11 05:01:59 +00:00
yaame
5c57fb5ea5 fix typo 2019-09-10 03:37:36 +00:00
yaame
896006ff4d Optimize and fill operation about git stash 2019-09-09 06:09:11 +00:00
MarvinJWendt
241437d1fe Fixes some spelling mistakes. (#283)
* url -> URL

https://dictionary.cambridge.org/dictionary/english/url

* Added article

* Added article

* Remove comma before and

* other -> another

* Add missing determiner

* lastet -> latest

https://dictionary.cambridge.org/dictionary/english/latest

* succeeeds -> succeeds

https://dictionary.cambridge.org/dictionary/english/succeed

* commited -> committed

* Update toc via doctoc
2019-09-06 12:30:46 -04:00
Alexander Gómez
16f81ed7b0 Added a nasa book (#278) 2019-09-06 12:28:09 -04:00
Richard Littauer
79c67f674e
Fixes to #274 (#275)
* added contribute other people repositories section

* fix: Edits to #274

* Update README.md

Co-Authored-By: Diego Sanchez <diegogsann@gmail.com>

* Update README.md

Co-Authored-By: Diego Sanchez <diegogsann@gmail.com>

* Update README.md

Co-Authored-By: Diego Sanchez <diegogsann@gmail.com>
2019-06-20 11:40:46 +02:00
Dustin Freeman
ad141eeeb6 Added a guide to removing large files from repo history using bfg (#249)
* Explanation of removing large files using bfg

* doctoc applied to removing large files guide

* Remove large files: clean up wording

* Add subheadings to the large file removal section in preparation for git-filter-branch explanation

* large file removal: clean up headings

* large file removal: force push considerations note

* Add word "private" to sensitive data section for searchability

* Finish git-filter-branch instructions

* Minor grammatical changes and simplifications.
2019-06-05 10:53:00 -04:00
Dustin Freeman
a545b0851d Remove broken link to nasa pdf doc. (#271) 2019-05-31 23:53:50 -04:00
Timo Sand
ff548e28d8 Updates TOC (#273) 2019-05-31 23:53:34 -04:00
Maroun Maroun
d3ac210fe4 Add "Debugging with Git" (#266)
* Add "Debugging with Git"

* Fix spelling error
2019-05-28 21:45:17 -04: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
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
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
hoannc
23e4b8d4f3 run doctoc 2018-11-14 07:42:26 -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
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
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