1
0
mirror of https://github.com/k88hudson/git-flight-rules.git synced 2025-07-15 12:55:01 -03:00
Commit Graph

270 Commits

Author SHA1 Message Date
cfca81c274 Adding 日本語 to all of the lists 2020-04-30 17:01:35 -04:00
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
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
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
40a542d31a English language edits 2019-09-30 08:50:18 -04:00
f1a2195372 add note about git stash pop --index 0 2019-09-20 05:43:05 +00:00
4252773598 fix git stash push 2019-09-12 01:12:30 +00:00
260a140bda fix case: switch stage & unstage files 2019-09-11 05:01:59 +00:00
5c57fb5ea5 fix typo 2019-09-10 03:37:36 +00:00
896006ff4d Optimize and fill operation about git stash 2019-09-09 06:09:11 +00:00
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
16f81ed7b0 Added a nasa book (#278) 2019-09-06 12:28:09 -04:00
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
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
a545b0851d Remove broken link to nasa pdf doc. (#271) 2019-05-31 23:53:50 -04:00
ff548e28d8 Updates TOC (#273) 2019-05-31 23:53:34 -04:00
d3ac210fe4 Add "Debugging with Git" (#266)
* Add "Debugging with Git"

* Fix spelling error
2019-05-28 21:45:17 -04:00
8e697833ae Add shortcuts information for Windows PowerShell (#263) 2018-12-11 12:29:13 -05:00
73547ca942 Add pcottle/learnGitBranching (#262) 2018-12-06 14:12:33 -05:00
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
8b09e3fb58 Slight wording changes 2018-12-06 09:55:45 -05:00
5cfcca513c Add section on reset -p to unstage edits
Expanded  explanation & corrected bad grammar.
2018-12-06 09:55:42 -05:00
b67b184d8a Merge branch 'nzachow-master' 2018-11-29 14:17:40 -05:00
ee10f43326 Adding a period. 2018-11-29 14:17:35 -05:00
0d109a7f9c Merge branch 'm007-master' 2018-11-29 14:12:12 -05:00
1877d108b0 Small wording changes 2018-11-29 14:12:07 -05:00
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
9d16c95ee1 Adds a few useful git aliases (#258)
Addresses #225
2018-11-29 11:28:21 -05:00
7cb8c1a105 Merge branch 'grantslone-master' 2018-11-28 08:56:04 -05:00
bbcb8f6704 Small grammar edits 2018-11-28 08:56:01 -05:00
8854c326b9 Merge branch 'retiform-master' 2018-11-28 08:48:05 -05:00
d6e98fd537 Small spelling and style changes 2018-11-28 08:47:50 -05:00
bd388a89c5 Update README.md 2018-11-27 23:01:22 -05:00
ca49abe067 Update README.md 2018-11-27 23:00:21 -05:00
8809567e7a Update README.md 2018-11-27 22:59:54 -05:00
9b54d14dff Update README.md 2018-11-27 22:57:52 -05:00
066cf428e1 Update README.md 2018-11-27 22:56:06 -05:00
a3ece44263 add french (fr) translation (#252) 2018-11-27 14:43:27 -05:00
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
4b6e19a5ea Fix typo (#254) 2018-11-14 18:28:44 -05:00
23e4b8d4f3 run doctoc 2018-11-14 07:42:26 -05:00
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
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
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
c767e4b22a Add rebase --onto details (#231) 2018-10-24 10:09:06 +02:00
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
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
02d9745c00 Add note about Git version (#217)
See #216. @ramiro how does this look?
2018-10-23 14:43:49 +02:00
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
1eb620d54c Make amend commands more specific (#218)
Previously, this document the same command for "I wrote the wrong thing in a commit message" and "I need to add staged changes to the previous commit". These are different operations! Now, the former has a command that only changes the commit message (without adding staged changes), and the latter has commands to add staged changes with or without updating the commit message.

I also added "reword" and "extend" aliases to the sample gitconfig for using the two pieces of `git commit --amend` separately.
2018-10-23 14:24:26 +02:00