1
0
mirror of https://github.com/k88hudson/git-flight-rules.git synced 2025-08-04 06:27:43 -03:00

250 Commits

Author SHA1 Message Date
Zhizhen He
aefc20702d fix: typo in README.md (#343) 2023-02-01 02:18:00 +00:00
apastan
8413701f30 Update info how to reset local branch to remote-tracking branch (#344) 2023-02-01 02:17:42 +00:00
apastan
3ff35c8642 Update reflog shortname with an ancestry reference (#345) 2023-02-01 02:17:10 +00:00
apastan
18c656604b Edits: changes in specific file between commits/branches (#346) 2023-02-01 02:16:27 +00:00
Luminous-Coder
c34b49ff5a Correct punctuations and improve readability for zh-TW (#347) 2023-02-01 02:16:12 +00:00
ericfeunekes
3d101f5456 added I want to move a change from one commit to another (#342)
Co-authored-by: Eric Feunekes <eric.feunekes@pwc.com>
2022-12-06 23:59:15 +00:00
RuiSiang
a8897df82d Add traditional Chinese with terminology changes (#341) 2022-12-06 23:58:46 +00:00
舜岳
04507b8fc3 fix: README_zh-CN (#339) 2022-11-28 21:53:27 +00:00
Jared Culp
5f1db99e49 Fix "gim" typo (#331) 2021-09-22 16:37:55 -04:00
Steve-V
65bd59262f Title of Chris Hadfield's book is incorrect (#319)
It is actually "An Astronaut's Guide to Life on Earth"

https://www.worldcat.org/title/astronauts-guide-to-life-on-earth/oclc/872711307
2021-07-04 13:13:22 -04:00
Viet Than
7caa59575b Update Vietnamese translations (#318) 2021-06-25 12:29:37 -04:00
Thi Minh Nhut
eb36083cbd Fix Spelling Vietnamese (#315) 2021-05-17 10:10:52 -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
Shota Imaki
3a855c6e37 Run doctoc 2020-02-27 23:15:42 +09:00
SI
6b0d0090f5 Elaborate Introduction 2020-02-27 23:06:44 +09:00
Shota Imaki
421e7e9c75 Unify spacing 2020-02-27 22:59:27 +09:00
Shota Imaki
178b145f41 Avoid colon in sentences 2020-02-27 22:57:38 +09:00
Shota Imaki
ceb2109a3f Translate comment 2020-02-27 22:56:47 +09:00
Shota Imaki
e0c6fa128e Unify wording; 次のコマンド -> 次 2020-02-27 22:56:11 +09:00
Shota Imaki
c87aaf142f Unify wording; 編集内容 -> 編集 2020-02-27 22:54:27 +09:00
Shota Imaki
cc284a63a3 Unify wording; ステージング -> ステージ 2020-02-27 22:51:49 +09:00
Shota Imaki
a555e4295e Specify wording; 任意の -> 特定の/全ての 2020-02-27 22:49:30 +09:00
Shota Imaki
d927b41906 Unify wording; 既に -> すでに 2020-02-27 22:45:15 +09:00
Shota Imaki
4935207bd7 Unify wording; 編集内容 -> 編集 2020-02-27 22:43:50 +09:00
SI
25397ac3f2 Elaborate # Other Resources 2020-02-27 22:22:15 +09:00
SI
3868e6ccf6 Elaborate ## I've no idea what I did wrong 2020-02-27 22:18:16 +09:00
SI
ba331a523b Elaborate ## Configuration 2020-02-27 22:14:20 +09:00
SI
718e24db95 Elaborate ## Debugging with Git 2020-02-27 22:11:36 +09:00
SI
94b47ea011 Elaborate ## Tracking Files 2020-02-27 22:08:09 +09:00
SI
5f5a60b242 Elaborate ## Miscellaneous Objects 2020-02-27 22:05:23 +09:00
SI
f2734d6361 Elaborate ## Submodules 2020-02-27 22:02:48 +09:00
SI
37f9a744ef Elaborate ## Finding 2020-02-27 22:01:32 +09:00
SI
cd9bfd055a Elaborate ## Stash 2020-02-27 21:57:28 +09:00
SI
6fdf31d5b4 Elaborate ## Rebasing and Merging 2020-02-27 21:53:30 +09:00
SI
b3d43db200 Elaborate ## Branches 2020-02-24 19:36:17 +09:00
SI
b98b984070 Elaborate ## Unstaged Edits 2020-02-24 19:02:56 +09:00
SI
59307fd087 Elaborate ## Staging 2020-02-24 18:55:52 +09:00
SI
ec45354d85 Elaborate ## Editing Commits 2020-02-24 18:50:49 +09:00
SI
7d9dd08625 Elaborate ## Repositories 2020-02-24 18:12:18 +09:00
SI
964d02f7f6 Translate Introduction 2020-02-23 11:47:15 +09:00
SI
3aa4c6d9a6 Translate # Other Resources 2020-02-22 20:28:09 +09:00
SI
85c967e090 Translate ## Git Shortcuts 2020-02-22 19:53:18 +09:00
SI
f370468b5e Translate ## I've no idea what I did wrong 2020-02-22 19:41:53 +09:00
SI
3f3e2cde29 Translate ## Configuration 2020-02-22 18:48:48 +09:00
SI
40726c96f7 Translate ## Debugging with Git 2020-02-20 22:12:26 +09:00
SI
0e0971809f Translate ## Tracking Files 2020-02-20 21:55:36 +09:00
SI
e09b1cac83 Translate ## Miscellaneous Objects 2020-02-20 21:37:19 +09:00
SI
675c08afd9 Translate ## Submodules 2020-02-20 21:17:40 +09:00
SI
96c427d51d Translate ## Finding 2020-02-17 22:00:30 +09:00
SI
c20458cbff Translate ## Stash 2020-02-17 21:22:39 +09:00
SI
b01317d586 Translate ## Rebasing and Merging 2020-02-16 10:57:43 +09:00
SI
e6d3f8a659 Translate ## Branches 2020-02-15 11:02:54 +09:00
SI
1d52880553 Translate ## Unstaged Edits 2020-02-14 22:04:42 +09:00
SI
c593b5ede3 Translate ## Staging 2020-02-14 21:35:05 +09:00
SI
5d1814a388 Translate ## Editing Commits 2020-02-13 23:52:53 +09:00
SI
a9acfde034 Elaborate ## Repositories 2020-02-13 19:29:45 +09:00
SI
73f711331e Translate ##Repositories 2020-02-13 14:04:44 +09:00
Shota Imaki
79584f5e20 initialize ja 2020-02-13 12:13:04 +09:00
kpoznyakov
4afbb4e710 fix typo in 'скомпромЕтированныМ' (#292)
https://ru.wiktionary.org/wiki/%D1%81%D0%BA%D0%BE%D0%BC%D0%BF%D1%80%D0%BE%D0%BC%D0%B5%D1%82%D0%B8%D1%80%D0%BE%D0%B2%D0%B0%D1%82%D1%8C
2020-01-17 10:02:24 -05: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
Artem Buslov
e0ff2c06b9 update Russian translation (#286) 2019-10-15 11:24:03 +00: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
Wei
1cef8c2032 Improve the first sentence in Zh translation (#281) 2019-09-06 12:30:06 -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
Artem Buslov
b14710acdf Update Russian translation (#270) 2019-05-28 10:22:04 -04:00
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
David Glasser
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
Nicolas Zachow
0b7921c8d5 I want to view the evolution of a function 2018-10-17 23:07:16 -03:00
grantslone
9bc656bdcc Added cred helper info 2018-10-17 15:28:13 -04:00
retiform
d988a3ab10 add instructions for what to do if you add the wrong remote 2018-10-17 13:42:42 -04:00
hadongsoo
83261c5b7a Translate and add Korean (#215)
* make a readme

make a new readme for Korean

* git-flight-rule 번역 중간과정 01

브랜치 부분에서 한번 커밋

* git-flight-rule 번역 중간과정 02

머지 시작

* git-flight-rule 번역 1차 종료후 점검

* 점검 후 첫 완료

* 오타 수정 몇가지 수정

* 네비게이션 링크 추가

* 표현 수정
2018-09-13 14:20:07 -04:00
abdel ali
c2ffba97eb I committed and pushed a merge that shouldn't have happened (#213) 2018-07-17 17:59:17 -04:00
Artem Buslov
8cfa8e476a Translate README_ru.md via GitLocalize (#210) 2018-07-09 16:50:20 -04:00
Richard Littauer
df439158b4 fix link 2018-06-14 10:40:04 -04:00
Daryl
29a9c7cbca Rename README-es.md and add link to it from README.md (#212)
When viewing the git-flight-rules repository under gitlab, it lists the first README*.md file, which for some reason it sorts `-` before `.`.  This changes the Spanish README's filename to match the other two translations already in this repository.
2018-06-14 10:35:18 -04:00
Moisés Ñañez
a06bef415e Add spanish translation (#119) 2018-05-14 12:40:45 -04:00
Richard Littauer
42472aaa94 Remove unnecessary tag 2018-05-14 12:37:08 -04:00
Filip Havrlent
0f16ad1e2d Issue #194 - Snippet to list changes (diff) of a specific file between two commits (or branches) 2018-05-14 12:37:08 -04:00
Richard Littauer
4f3582494d Incorporate Git Cheatsheet (#174)
* Adding Git Cheatsheet commands

This is an example of how #90 should be done.

* Move other configuration commands

* Move configuration
2018-05-14 12:35:33 -04:00
Erik Martin-Dorel
4d42bb9070 Fix rule "i-want-to-create-a-new-remote-branch-from-current-local-one" (#208)
* Add missing HEAD argument in 2 Git commands

These commands had been inserted in #148 and (over)simplified in #163.

The issue is that `git push <remote>` and `git push -u <remote>` will
typically raise the error below (unlike `git push <remote> HEAD`):

--8<---------------cut here---------------start------------->8---
fatal: The current branch new-branch has no upstream branch.
To push the current branch and set the remote as upstream, use

    git push --set-upstream origin new-branch
--8<---------------cut here---------------end--------------->8---

* Add doc URL & Avoid triple backquotes
2018-02-20 15:14:13 -04:00
Gabriel Caruso
d8c55ae8c5 Fix misspelling (#206) 2018-02-05 09:01:13 -04:00
Artem Buslov
14ea0820c8 Added test for TOC to .travis.yml (#205)
Runs doctoc for README*.md.
If in newly doctoc'ed README*.md there are any diffs against
ones commited in git HEAD then the test failes.
The script are using the latest anchor-markdown-header from repo
to avoid the bug with non-ASCII headers.
2018-01-13 22:00:59 -05:00
Artem Buslov
ea40bf75ca Translate README_ru.md via GitLocalize (#203) 2018-01-11 08:57:04 -05:00
Gabriel Caruso
fb27b20f1f Remove unnecessary anchor tags (#200) 2018-01-07 10:47:23 -05:00
Nick Kirby
e0513d81c2 I made changes to the wrong branch (#202)
* I made changes to the wrong branch

* Missed from last commit

* Fixing links

* Making changes

* Another change

* Moving section
2018-01-07 10:46:31 -05:00
Emmanuel Arias
be480c4c35 Merge pull request #201 from carusogabriel/patch-1
Possible mistake
2018-01-02 09:19:18 -03:00
Gabriel Caruso
3f85b185de Possible mistake 2018-01-02 07:30:25 -02:00
Gabriel Caruso
f9792e9c68 Clean up READMEs (#198)
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
2018-01-01 11:40:52 -06:00
Richard Littauer
590f63c7e6 Add colon 2017-12-30 12:26:44 -06:00
vonglasow
5de8869df2 Add a way to find tags containing specific commit (#195)
* Add a way to find tags containing specific commit

* fixup! Add a way to find tags containing specific commit
2017-12-30 13:21:53 -05:00
Leandro Loriato
4dcb631734 Including snippet to list commits containing specific files (#197) 2017-12-30 12:57:11 -05:00
Gabriel Caruso
e4e6ee08b1 Add "I want to delete multiple branches" (#196) 2017-12-30 12:25:11 -05:00
Artem Buslov
26138f0f10 Fixed typo in git branch -rr invocation (#190) 2017-12-29 09:52:07 -05:00
Artem Buslov
68820c1dc3 Auto-check for translated pages README_*.md with Travis CI (#188) 2017-12-23 10:51:19 -05:00
Artem Buslov
84322067fe Updated Russian translations (#187) 2017-12-23 10:50:23 -05:00
Eduardo Matos
7dc4eedb17 Removing -x on git clean tip to avoid unintentional use (#186)
* Removing -x on git clean to avoid unintentionally use

* Removing ! on git clean tip
2017-12-22 10:43:25 -05:00
Vitor Guilherme Forbrig
697dbb404f Update CONTRIBUTE.md (#185)
gitlocalize repository url
2017-12-22 09:41:14 -05:00
Kate Hudson
423eaf0ede Merge pull request #183 from sotayamashita/feature/validate-links
Add travis config to validate links
2017-12-21 14:07:29 -05:00
Richard Littauer
ae8459b6da Missed this grammar bit 2017-12-20 20:39:16 -05:00
Sam Yamashtia
3966d41462 Add translation section to contributing (#179)
* Add translation section to contributing

* Update CONTRIBUTE.md

* Update CONTRIBUTE.md

* Update CONTRIBUTE.md
2017-12-20 20:38:10 -05:00
Mike Melnicki
ca04c4bfb4 Added the Atlassian Git tutorial site (#181) 2017-12-20 16:08:19 -05:00
Mike Melnicki
58fab97420 Fixed the typo for Sourcetree and updated the description (#180) 2017-12-19 22:12:56 -05:00
Sam Yamashita
c91d1081c4 Add travis config to calidate links 2017-12-20 11:34:49 +09:00
Kate Hudson
e5039cc2b9 Rename zh-CN translation to be compatible with GitLocalize (#178) 2017-12-19 19:47:46 -05:00
Richard Littauer
f462bad54d Add examples from the common screwups resource in #40 (#175)
* Adding submodule section

* Add the rest of the commands
2017-12-19 19:47:30 -05:00
Siddharth Kannan
da44b4d6c1 add the usage information for for git-branch --set-upstream-to (#176)
* add application for git-branch --set-upstream-to

* run doctoc - typo in one line for the TOC

* put note in bash comment
2017-12-18 09:03:33 -05:00
Dineshkumar Pandiyan
da6f0f8e66 Branches - list branches (#171) 2017-12-16 11:50:00 -05:00
lxjwlt
d6d5c6f920 fix a typo (#170) 2017-12-13 10:12:23 -05:00
Emmanuel Arias
4a6f537157 Merge pull request #166 from k88hudson/feat/set-head
Add an example using `set-head`
2017-12-12 13:06:54 -03:00
Clemens Lieb
8d74313257 Add reset-author and no-edit to author rewriting (#169) 2017-12-12 08:56:52 -05:00
JUAN CALVOPINA M
418f0a0032 Added new topic: Finding (#168)
* New Topic for 'Finding'

Added command which can be used to find a string in any commit

* Added command that can be used to find for commits either by author or committer

* Fixed link
2017-12-10 14:08:44 -05:00
Artem Buslov
472f05caf0 Added section with links to every language (#167) 2017-12-10 14:07:30 -05:00
Richard Littauer
7a68447ac9 Add an example using set-head
This is just one of many possible examples using set-head, but which might be useful for others to discover the command.
2017-12-08 15:39:07 -05:00
Kaartic Sivaraam
12bc63375d A few cleanups (#163)
* Consolidate the name of the subsystem

The name of the subsytem is considered to be 'Git' and not 'git'.
There was inconsistency in the document by referring to the subsystem
using both 'git' and 'Git'.

Consolidate the usages to 'Git' which is generally considered to be
the name of the subsystem.

* Consolidate the name of GitHub

They website is generally called 'GitHub' and not 'github'.

* Quote the git commands correctly

* Avoid fullstops in section names

This is done for the sake of consistency. Most of the section names
don't have a fullstop at the end.

So, ...

* Update the ToC

The Table of Contents seems to have been out of date with the section
titles.

So, update the ToC with 'doctoc'.

* Clarify that the changes are removed only for the previous commit

* Showcase the flexibility of `git fetch -p`

The example for that exhibits the way to 'prune' remote branches that
were deleted upstream wasn't flexible as it relied on the command
defaulting to the upstream of the current branch. This might lead
the reader into overlooking the flexibility of the `git fetch`.

Show that the 'upstream' can be mentioned in the command thus show
casing the flexibility of `git fetch`.

* Exemplify the safer version of branch deletion

It's not good for newbies to start using 'force deletion' when they
want to delete a branch as it might lead them to them into
'accidentally' deleting their branches often without merging them
into other branches or pushing them to an upstream.

So, exemplify the safer version of branch deletion (branch -d) and
warn them about what `git branch -D` does.

* Improve readability of a few phrases

It's not required to use 'git' a lot as this a document about Git,
after all.

* Use HTTPS links for sites that serve using HTTPS

* Clarify that rebasing just re-writes history

Rebasing fast-forwards when the tip of the branch is a descendent of
the tip of the upstream. In other cases it re-writes the history. This
re-write is what actually leads the user to 'force' update the remote.

So, clarify that a user has to force update only when the history is
re-written regardless of whether the branch was fast-forwarded.

* Attribute both the authors of the second edition of Pro Git

* Try a different form of emphasizing text

Capitalizing words seems to be over emphasizing words. Italicize
the words, instead to see if works.

* Mention what 'upstream' means for the sake of clarity

* Simplify the way to create a remote branch from the local one

The commands were needlessly complex by not considering the fact
that the command defaults to HEAD when no branch is specified and
changing configuration when it wasn't required.

Simplify the commands to make readers more happy!

* Remove a character cruft left over while editing

This is an instance of a carelessly edited document getting into
version control. ;)

* Improve a sentence

... by,

- expanding acronyms
- quoting a command line parameter
2017-12-08 11:47:41 -05:00
Artem Buslov
565b8259da Update Russian translations up to English source (#165) 2017-12-07 15:18:06 -05:00
Kaartic Sivaraam
0e478ad4cc Show how a newly added file can be removed (#164)
This shows how the user can remove a newly added file from the
previous commit.
2017-12-04 15:57:20 -05:00
Dineshkumar Pandiyan
231b474600 Discarding staged changes vs unstaged changes - commands corrected (#159)
* Discarding staged changes vs unstaged changes - commands corrected

* added space between word and parenthesis

* Added <a> tag and TOC for content

* adding missing backticks

* Updated links in staging section
2017-12-03 11:57:20 -05:00
Artem Buslov
02e357c5b4 Added russian translations (#161) 2017-12-02 15:09:14 -05:00
hgautham
c128fff050 Iss-150: Fixed section about discarding local uncommitted changes (#160)
Iss-150: minor fix
2017-11-30 16:28:13 -05:00
Emmanuel Arias
5eaca03df3 Merge pull request #158 from juanca87/git-merge-abort
Added command to abort the merge
2017-11-28 11:14:27 -03:00
JUAN CALVOPINA M
045015f66d Update README.md
Added a link to the description to abort the merge
2017-11-28 10:52:16 -03:00
Juan Calvopina
5fc6b2289d Added command to abort the merge 2017-11-28 00:02:58 -03:00
Tadeu Manoel
f4c0fac6ef Add safety note for git reset --hard (#157)
resolves #155
2017-11-27 15:44:52 -05:00
Josh
7440fa32b5 Discard local uncommitted changes (#156) 2017-11-27 13:30:38 -05:00
Scott Dutton
02043187a7 Add githug (#152)
* Add githug

Githug is a great interactive game for leaning git

* Update README.md
2017-11-26 19:01:08 -05:00
Rijul1999
7cdaca391f Added some common Git screwups and solutions (#148)
* Added some common Git screwups and solutions

* Added required changes

* Added another way to create new remote branch

* Added required changes

* Added required changes

* Added  required changes

* Added required changes
2017-11-26 19:00:03 -05:00
Emmanuel Arias
8426f177dd Fix #149 @RichardLitt comment
Fix #149 PR merged
2017-11-23 21:41:39 -03:00
Emmanuel Arias
71f2ab2917 Merge pull request #149 from flexdinesh/master
flight-rule to stash multiple files at once
2017-11-23 12:05:22 -03:00
Dinesh
4bf16453c6 flight-rule to stash multiple files at once 2017-11-23 01:11:14 +05:30
Kate Hudson
7412b89d42 Merge pull request #147 from benyanke/patch-1
Added gitk
2017-11-21 16:33:36 -05:00
Ben Yanke
11c11ecc21 Update README.md 2017-11-21 13:23:03 -06:00
Toshiya Kawasaki
5088d30821 Add sample of -u option of git stash (#146) 2017-11-21 13:13:31 -05:00
Navneet Singh
adb5a2d250 added command to create a branch from a commit (#145)
Using this command one can create a branch from a specific commit from current branch.
2017-11-20 13:51:04 -05:00
Nicolas Dermine
4cb52c015c fix typo (#142) 2017-11-19 12:56:54 -05:00
Nicolas Dermine
9dafe52a63 fix typo (#141) 2017-11-19 12:56:42 -05:00
Dineshkumar Pandiyan
2e5498cd5c New Topic for 'Stashing' and curated frequent stash workflow (#140) 2017-11-19 03:34:21 -05:00
Navneet Singh
5599a75b7f added another command to see staged diff (#139)
This command is an alternative to view all the changes in the staged files.
2017-11-18 13:56:47 -05:00
Navneet Singh
b7d9be9af9 stash content with a custom message (#138)
Added command which can be used to stash code marked with a custom message
2017-11-18 10:03:11 -05:00
Sergey
2637bf010f Add fork and gmaster (#137)
* add fork

* add fork
2017-11-16 15:34:47 -05:00
Greg Walden
f506073152 change [aliases] to [alias] (#136)
* change [aliases] to [alias]

Titling the section `aliases` did not work for me. Changing to `[alias]` worked immediately.

Reference: https://git-scm.com/docs/git-config#git-config-alias

* Update README_zh-cn.md
2017-11-15 10:57:11 -05:00
Richard Littauer
e51ba1db7d fix formatting 2017-11-15 09:08:38 -05:00
Tatsujinichi
b838720631 Be more specific about HEAD^ vs HEAD~ (#122)
* Be more specific about HEAD^ vs HEAD~

* add more

* revise again
2017-11-15 09:08:04 -05:00
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
jparser
88e905a4c2 Add Chinese translation (#121) 2017-11-09 08:18:10 -05: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
Richard Littauer
cf82e4d95e Merge pull request #115 from k88hudson/license
fix #112: Add cc-by-sa-4.0 license
2017-11-06 21:07:24 -05:00
Kate Hudson
1e80224456 Merge pull request #114 from arnavb/update-text
Minor Text Update
2017-11-06 20:16:13 -05:00
k88hudson
4bc70b6aab fix #112: Add cc-by-sa-4.0 license 2017-11-06 20:13:25 -05:00
Arnav Borborah
7f2a4bfd03 Minor text update 2017-11-06 20:09:42 -05:00
Richard Littauer
7ebe86b76e Merge pull request #113 from Shayac/master
add learngitbranching tutorial
2017-11-06 19:42:30 -05:00
Shaya Cohen
1883097a8b add learngitbranching tutorial 2017-11-06 19:22:35 -05:00
Richard Littauer
bfb67fc369 Merge pull request #111 from Shayac/master
Add Scott Chacon's other git book
2017-11-06 19:06:43 -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
Richard Littauer
688ab59c2c Merge pull request #108 from thomasyimgit/checkout-remote-branch
add checkout to remote branch
2017-11-06 08:42:19 -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
Richard Littauer
f3428ed7af Merge pull request #105 from Plsr/master
Use 'branch' instead of 'checkout -b'
2017-03-29 16:13:45 -04:00
plsr
5af92eed17 Use 'branch' instead of 'checkout -b' 2017-03-29 11:55:42 +02:00
Richard Littauer
a5d7eea0d5 Merge pull request #104 from camilortte/patch-1
Add Git Gui Client (GitKraken)
2017-01-16 14:40:08 -03: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
Richard Littauer
bad1b36f56 Merge pull request #103 from codeofcarson/master
Add a new rule, how to discard specific unstaged changes
2016-12-29 15:39:13 -05: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
14 changed files with 14816 additions and 161 deletions

2
.gitignore vendored Normal file
View File

@@ -0,0 +1,2 @@
node_modules/
package-lock.json

11
.travis.yml Normal file
View File

@@ -0,0 +1,11 @@
language: ruby
rvm:
- 2.2
before_script:
- gem install awesome_bot
- npm install
script:
- awesome_bot README.md --allow-dupe --allow-redirect --allow-ssl
- awesome_bot README_*.md --allow-dupe --allow-redirect --allow-ssl
- npm run toc
- npm run diff

View File

@@ -26,3 +26,21 @@ This is a community built document. Dive in and help out!
```sh
(relevant branch)$ git blah blah
```
## Translation
We use a translation tool called [GitLocalize][gl]. Please follow these steps to get started with your contributions:
1. Go to [GitLocalize's k88hudson/git-flight-rules repository][gl-repo].
1. Sign up using your GitHub account :octocat:.
1. Find the document you are going to translate.
1. Happy translating :sparkles: .
1. When you are done, send the translation for reviews.
1. The reviewed translation will be sent as a Pull Request to GitHub by the language moderator in the community.
To learn more about how GitLocalize works, visit their [help page][gl-help]. If you find any issues or feature requests, please file them in [GitLocalize's issue tracker][gl-issue-tracker].
[gl]: https://gitlocalize.com
[gl-help]: https://docs.gitlocalize.com/
[gl-issue-tracker]: https://github.com/gitlocalize/feedback
[gl-repo]: https://gitlocalize.com/repo/598

427
LICENSE Normal file
View File

@@ -0,0 +1,427 @@
Attribution-ShareAlike 4.0 International
=======================================================================
Creative Commons Corporation ("Creative Commons") is not a law firm and
does not provide legal services or legal advice. Distribution of
Creative Commons public licenses does not create a lawyer-client or
other relationship. Creative Commons makes its licenses and related
information available on an "as-is" basis. Creative Commons gives no
warranties regarding its licenses, any material licensed under their
terms and conditions, or any related information. Creative Commons
disclaims all liability for damages resulting from their use to the
fullest extent possible.
Using Creative Commons Public Licenses
Creative Commons public licenses provide a standard set of terms and
conditions that creators and other rights holders may use to share
original works of authorship and other material subject to copyright
and certain other rights specified in the public license below. The
following considerations are for informational purposes only, are not
exhaustive, and do not form part of our licenses.
Considerations for licensors: Our public licenses are
intended for use by those authorized to give the public
permission to use material in ways otherwise restricted by
copyright and certain other rights. Our licenses are
irrevocable. Licensors should read and understand the terms
and conditions of the license they choose before applying it.
Licensors should also secure all rights necessary before
applying our licenses so that the public can reuse the
material as expected. Licensors should clearly mark any
material not subject to the license. This includes other CC-
licensed material, or material used under an exception or
limitation to copyright. More considerations for licensors:
wiki.creativecommons.org/Considerations_for_licensors
Considerations for the public: By using one of our public
licenses, a licensor grants the public permission to use the
licensed material under specified terms and conditions. If
the licensor's permission is not necessary for any reason--for
example, because of any applicable exception or limitation to
copyright--then that use is not regulated by the license. Our
licenses grant only permissions under copyright and certain
other rights that a licensor has authority to grant. Use of
the licensed material may still be restricted for other
reasons, including because others have copyright or other
rights in the material. A licensor may make special requests,
such as asking that all changes be marked or described.
Although not required by our licenses, you are encouraged to
respect those requests where reasonable. More_considerations
for the public:
wiki.creativecommons.org/Considerations_for_licensees
=======================================================================
Creative Commons Attribution-ShareAlike 4.0 International Public
License
By exercising the Licensed Rights (defined below), You accept and agree
to be bound by the terms and conditions of this Creative Commons
Attribution-ShareAlike 4.0 International Public License ("Public
License"). To the extent this Public License may be interpreted as a
contract, You are granted the Licensed Rights in consideration of Your
acceptance of these terms and conditions, and the Licensor grants You
such rights in consideration of benefits the Licensor receives from
making the Licensed Material available under these terms and
conditions.
Section 1 -- Definitions.
a. Adapted Material means material subject to Copyright and Similar
Rights that is derived from or based upon the Licensed Material
and in which the Licensed Material is translated, altered,
arranged, transformed, or otherwise modified in a manner requiring
permission under the Copyright and Similar Rights held by the
Licensor. For purposes of this Public License, where the Licensed
Material is a musical work, performance, or sound recording,
Adapted Material is always produced where the Licensed Material is
synched in timed relation with a moving image.
b. Adapter's License means the license You apply to Your Copyright
and Similar Rights in Your contributions to Adapted Material in
accordance with the terms and conditions of this Public License.
c. BY-SA Compatible License means a license listed at
creativecommons.org/compatiblelicenses, approved by Creative
Commons as essentially the equivalent of this Public License.
d. Copyright and Similar Rights means copyright and/or similar rights
closely related to copyright including, without limitation,
performance, broadcast, sound recording, and Sui Generis Database
Rights, without regard to how the rights are labeled or
categorized. For purposes of this Public License, the rights
specified in Section 2(b)(1)-(2) are not Copyright and Similar
Rights.
e. Effective Technological Measures means those measures that, in the
absence of proper authority, may not be circumvented under laws
fulfilling obligations under Article 11 of the WIPO Copyright
Treaty adopted on December 20, 1996, and/or similar international
agreements.
f. Exceptions and Limitations means fair use, fair dealing, and/or
any other exception or limitation to Copyright and Similar Rights
that applies to Your use of the Licensed Material.
g. License Elements means the license attributes listed in the name
of a Creative Commons Public License. The License Elements of this
Public License are Attribution and ShareAlike.
h. Licensed Material means the artistic or literary work, database,
or other material to which the Licensor applied this Public
License.
i. Licensed Rights means the rights granted to You subject to the
terms and conditions of this Public License, which are limited to
all Copyright and Similar Rights that apply to Your use of the
Licensed Material and that the Licensor has authority to license.
j. Licensor means the individual(s) or entity(ies) granting rights
under this Public License.
k. Share means to provide material to the public by any means or
process that requires permission under the Licensed Rights, such
as reproduction, public display, public performance, distribution,
dissemination, communication, or importation, and to make material
available to the public including in ways that members of the
public may access the material from a place and at a time
individually chosen by them.
l. Sui Generis Database Rights means rights other than copyright
resulting from Directive 96/9/EC of the European Parliament and of
the Council of 11 March 1996 on the legal protection of databases,
as amended and/or succeeded, as well as other essentially
equivalent rights anywhere in the world.
m. You means the individual or entity exercising the Licensed Rights
under this Public License. Your has a corresponding meaning.
Section 2 -- Scope.
a. License grant.
1. Subject to the terms and conditions of this Public License,
the Licensor hereby grants You a worldwide, royalty-free,
non-sublicensable, non-exclusive, irrevocable license to
exercise the Licensed Rights in the Licensed Material to:
a. reproduce and Share the Licensed Material, in whole or
in part; and
b. produce, reproduce, and Share Adapted Material.
2. Exceptions and Limitations. For the avoidance of doubt, where
Exceptions and Limitations apply to Your use, this Public
License does not apply, and You do not need to comply with
its terms and conditions.
3. Term. The term of this Public License is specified in Section
6(a).
4. Media and formats; technical modifications allowed. The
Licensor authorizes You to exercise the Licensed Rights in
all media and formats whether now known or hereafter created,
and to make technical modifications necessary to do so. The
Licensor waives and/or agrees not to assert any right or
authority to forbid You from making technical modifications
necessary to exercise the Licensed Rights, including
technical modifications necessary to circumvent Effective
Technological Measures. For purposes of this Public License,
simply making modifications authorized by this Section 2(a)
(4) never produces Adapted Material.
5. Downstream recipients.
a. Offer from the Licensor -- Licensed Material. Every
recipient of the Licensed Material automatically
receives an offer from the Licensor to exercise the
Licensed Rights under the terms and conditions of this
Public License.
b. Additional offer from the Licensor -- Adapted Material.
Every recipient of Adapted Material from You
automatically receives an offer from the Licensor to
exercise the Licensed Rights in the Adapted Material
under the conditions of the Adapter's License You apply.
c. No downstream restrictions. You may not offer or impose
any additional or different terms or conditions on, or
apply any Effective Technological Measures to, the
Licensed Material if doing so restricts exercise of the
Licensed Rights by any recipient of the Licensed
Material.
6. No endorsement. Nothing in this Public License constitutes or
may be construed as permission to assert or imply that You
are, or that Your use of the Licensed Material is, connected
with, or sponsored, endorsed, or granted official status by,
the Licensor or others designated to receive attribution as
provided in Section 3(a)(1)(A)(i).
b. Other rights.
1. Moral rights, such as the right of integrity, are not
licensed under this Public License, nor are publicity,
privacy, and/or other similar personality rights; however, to
the extent possible, the Licensor waives and/or agrees not to
assert any such rights held by the Licensor to the limited
extent necessary to allow You to exercise the Licensed
Rights, but not otherwise.
2. Patent and trademark rights are not licensed under this
Public License.
3. To the extent possible, the Licensor waives any right to
collect royalties from You for the exercise of the Licensed
Rights, whether directly or through a collecting society
under any voluntary or waivable statutory or compulsory
licensing scheme. In all other cases the Licensor expressly
reserves any right to collect such royalties.
Section 3 -- License Conditions.
Your exercise of the Licensed Rights is expressly made subject to the
following conditions.
a. Attribution.
1. If You Share the Licensed Material (including in modified
form), You must:
a. retain the following if it is supplied by the Licensor
with the Licensed Material:
i. identification of the creator(s) of the Licensed
Material and any others designated to receive
attribution, in any reasonable manner requested by
the Licensor (including by pseudonym if
designated);
ii. a copyright notice;
iii. a notice that refers to this Public License;
iv. a notice that refers to the disclaimer of
warranties;
v. a URI or hyperlink to the Licensed Material to the
extent reasonably practicable;
b. indicate if You modified the Licensed Material and
retain an indication of any previous modifications; and
c. indicate the Licensed Material is licensed under this
Public License, and include the text of, or the URI or
hyperlink to, this Public License.
2. You may satisfy the conditions in Section 3(a)(1) in any
reasonable manner based on the medium, means, and context in
which You Share the Licensed Material. For example, it may be
reasonable to satisfy the conditions by providing a URI or
hyperlink to a resource that includes the required
information.
3. If requested by the Licensor, You must remove any of the
information required by Section 3(a)(1)(A) to the extent
reasonably practicable.
b. ShareAlike.
In addition to the conditions in Section 3(a), if You Share
Adapted Material You produce, the following conditions also apply.
1. The Adapter's License You apply must be a Creative Commons
license with the same License Elements, this version or
later, or a BY-SA Compatible License.
2. You must include the text of, or the URI or hyperlink to, the
Adapter's License You apply. You may satisfy this condition
in any reasonable manner based on the medium, means, and
context in which You Share Adapted Material.
3. You may not offer or impose any additional or different terms
or conditions on, or apply any Effective Technological
Measures to, Adapted Material that restrict exercise of the
rights granted under the Adapter's License You apply.
Section 4 -- Sui Generis Database Rights.
Where the Licensed Rights include Sui Generis Database Rights that
apply to Your use of the Licensed Material:
a. for the avoidance of doubt, Section 2(a)(1) grants You the right
to extract, reuse, reproduce, and Share all or a substantial
portion of the contents of the database;
b. if You include all or a substantial portion of the database
contents in a database in which You have Sui Generis Database
Rights, then the database in which You have Sui Generis Database
Rights (but not its individual contents) is Adapted Material,
including for purposes of Section 3(b); and
c. You must comply with the conditions in Section 3(a) if You Share
all or a substantial portion of the contents of the database.
For the avoidance of doubt, this Section 4 supplements and does not
replace Your obligations under this Public License where the Licensed
Rights include other Copyright and Similar Rights.
Section 5 -- Disclaimer of Warranties and Limitation of Liability.
a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
c. The disclaimer of warranties and limitation of liability provided
above shall be interpreted in a manner that, to the extent
possible, most closely approximates an absolute disclaimer and
waiver of all liability.
Section 6 -- Term and Termination.
a. This Public License applies for the term of the Copyright and
Similar Rights licensed here. However, if You fail to comply with
this Public License, then Your rights under this Public License
terminate automatically.
b. Where Your right to use the Licensed Material has terminated under
Section 6(a), it reinstates:
1. automatically as of the date the violation is cured, provided
it is cured within 30 days of Your discovery of the
violation; or
2. upon express reinstatement by the Licensor.
For the avoidance of doubt, this Section 6(b) does not affect any
right the Licensor may have to seek remedies for Your violations
of this Public License.
c. For the avoidance of doubt, the Licensor may also offer the
Licensed Material under separate terms or conditions or stop
distributing the Licensed Material at any time; however, doing so
will not terminate this Public License.
d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
License.
Section 7 -- Other Terms and Conditions.
a. The Licensor shall not be bound by any additional or different
terms or conditions communicated by You unless expressly agreed.
b. Any arrangements, understandings, or agreements regarding the
Licensed Material not stated herein are separate from and
independent of the terms and conditions of this Public License.
Section 8 -- Interpretation.
a. For the avoidance of doubt, this Public License does not, and
shall not be interpreted to, reduce, limit, restrict, or impose
conditions on any use of the Licensed Material that could lawfully
be made without permission under this Public License.
b. To the extent possible, if any provision of this Public License is
deemed unenforceable, it shall be automatically reformed to the
minimum extent necessary to make it enforceable. If the provision
cannot be reformed, it shall be severed from this Public License
without affecting the enforceability of the remaining terms and
conditions.
c. No term or condition of this Public License will be waived and no
failure to comply consented to unless expressly agreed to by the
Licensor.
d. Nothing in this Public License constitutes or may be interpreted
as a limitation upon, or waiver of, any privileges and immunities
that apply to the Licensor or You, including from the legal
processes of any jurisdiction or authority.
=======================================================================
Creative Commons is not a party to its public
licenses. Notwithstanding, Creative Commons may elect to apply one of
its public licenses to material it publishes and in those instances
will be considered the “Licensor.” The text of the Creative Commons
public licenses is dedicated to the public domain under the CC0 Public
Domain Dedication. Except for the limited purpose of indicating that
material is shared under a Creative Commons public license or as
otherwise permitted by the Creative Commons policies published at
creativecommons.org/policies, Creative Commons does not authorize the
use of the trademark "Creative Commons" or any other trademark or logo
of Creative Commons without its prior written consent including,
without limitation, in connection with any unauthorized modifications
to any of its public licenses or any other arrangements,
understandings, or agreements concerning use of licensed material. For
the avoidance of doubt, this paragraph does not form part of the
public licenses.
Creative Commons may be contacted at creativecommons.org.

1480
README.md

File diff suppressed because it is too large Load Diff

1452
README_es.md Normal file

File diff suppressed because it is too large Load Diff

1636
README_fr.md Normal file

File diff suppressed because it is too large Load Diff

2174
README_ja.md Normal file

File diff suppressed because it is too large Load Diff

1583
README_kr.md Normal file

File diff suppressed because it is too large Load Diff

1958
README_ru.md Normal file

File diff suppressed because it is too large Load Diff

2054
README_vi.md Normal file

File diff suppressed because it is too large Load Diff

1097
README_zh-CN.md Normal file

File diff suppressed because it is too large Load Diff

1071
README_zh-TW.md Normal file

File diff suppressed because it is too large Load Diff

14
package.json Normal file
View File

@@ -0,0 +1,14 @@
{
"private": true,
"name": "git-flight-rules",
"version": "1.0.0",
"description": "Flight rules for git",
"scripts": {
"toc": "doctoc --github README.md README_*.md",
"diff": "test -z \"`git diff -- README.md`\" && test -z \"`git diff -- README_*.md`\""
},
"devDependencies": {
"doctoc": "^1.3.0",
"anchor-markdown-header": "thlorenz/anchor-markdown-header#master"
}
}