1
0
mirror of https://github.com/k88hudson/git-flight-rules.git synced 2025-06-16 04:44:07 -03:00

404 Commits

Author SHA1 Message Date
f4dabebc83 Merge pull request #362 from lumynou5/change-author
Add method to change authors for multiple commits
2024-05-27 20:53:00 -03:00
449e36d21b Add information about filter-branch back 2024-05-21 11:05:33 +08:00
819b14a73f Add method to change authors for multiple commits 2024-05-14 13:58:41 +08:00
b752196266 Fix link in README_ja.md (#361) 2024-03-18 10:17:15 -04:00
1037756725 Adding Git cartoons by Allison Horst. (#360)
Adding https://allisonhorst.com/git-github. 

Also, alphabetized section.
2024-02-23 10:08:06 +11:00
e1fd8abce8 Improve (remove) "Unstaged Edits" (#358) 2023-09-27 10:35:07 -04:00
02cee38025 Fixed typos for internal and external links (#357)
* Update anchor link to `push.default` documentation

* Update anchor link to `rebase --merge` documentation

* Fix link typos
2023-07-21 13:41:29 -04:00
c3df156871 Clarify the use of --amend (#354)
Co-authored-by: Richard Littauer <richard.littauer@gmail.com>
2023-06-28 11:56:19 +02:00
0b1f7bcdaf Improve zh-TW (#352) 2023-06-28 11:51:46 +02:00
aefc20702d fix: typo in README.md (#343) 2023-02-01 02:18:00 +00:00
8413701f30 Update info how to reset local branch to remote-tracking branch (#344) 2023-02-01 02:17:42 +00:00
3ff35c8642 Update reflog shortname with an ancestry reference (#345) 2023-02-01 02:17:10 +00:00
18c656604b Edits: changes in specific file between commits/branches (#346) 2023-02-01 02:16:27 +00:00
c34b49ff5a Correct punctuations and improve readability for zh-TW (#347) 2023-02-01 02:16:12 +00:00
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
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
5f1db99e49 Fix "gim" typo (#331) 2021-09-22 16:37:55 -04:00
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
7caa59575b Update Vietnamese translations (#318) 2021-06-25 12:29:37 -04:00
eb36083cbd Fix Spelling Vietnamese (#315) 2021-05-17 10:10:52 -04:00
5816815453 New rule: split a branch into two (#314) 2021-03-18 08:42:18 -04:00
9e1faad0e9 chore: Update ToC 2021-02-25 09:16:54 -05:00
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
fa148da698 Replace master with main (issue/#308) (#309) 2020-12-01 09:44:45 -05:00
82f0b3994d add patch workflow to sharing code section (#307) 2020-11-28 16:15:14 -05:00
cfca81c274 Adding 日本語 to all of the lists 2020-04-30 17:01:35 -04:00
3a855c6e37 Run doctoc 2020-02-27 23:15:42 +09:00
SI
6b0d0090f5 Elaborate Introduction 2020-02-27 23:06:44 +09:00
421e7e9c75 Unify spacing 2020-02-27 22:59:27 +09:00
178b145f41 Avoid colon in sentences 2020-02-27 22:57:38 +09:00
ceb2109a3f Translate comment 2020-02-27 22:56:47 +09:00
e0c6fa128e Unify wording; 次のコマンド -> 次 2020-02-27 22:56:11 +09:00
c87aaf142f Unify wording; 編集内容 -> 編集 2020-02-27 22:54:27 +09:00
cc284a63a3 Unify wording; ステージング -> ステージ 2020-02-27 22:51:49 +09:00
a555e4295e Specify wording; 任意の -> 特定の/全ての 2020-02-27 22:49:30 +09:00
d927b41906 Unify wording; 既に -> すでに 2020-02-27 22:45:15 +09:00
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
79584f5e20 initialize ja 2020-02-13 12:13:04 +09:00
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
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
e0ff2c06b9 update Russian translation (#286) 2019-10-15 11:24:03 +00: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
Wei
1cef8c2032 Improve the first sentence in Zh translation (#281) 2019-09-06 12:30:06 -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
b14710acdf Update Russian translation (#270) 2019-05-28 10:22:04 -04:00
d4cf0fb88a Allows SSL errors in links (#265)
Fixes #264
2019-01-30 10:11:55 +02: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
c9cfb71843 README_fr.md - replacing weird characters (#259)
Thanks for the translation!
2018-11-29 11:26:58 -05:00
4b5cad207a Use npm scripts for travis commands 2018-11-28 09:07:46 -05:00
db69499594 Ran doctoc again 2018-11-28 09:07:38 -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
911089c406 Update README_kr.md (#257)
edit typo 🇰🇷
2018-11-27 12:12:13 -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
f4037ec5c1 Fix option to amend commit message (#255) 2018-11-14 18:28:28 -05:00
20e4b2c10d Merge branch 'hoannc54-master' 2018-11-14 07:42:46 -05:00
23e4b8d4f3 run doctoc 2018-11-14 07:42:26 -05:00
bd9af24828 update 2018-11-14 01:47:05 +07:00
bbbead4bcd add test 2 2018-11-12 23:52:23 +07:00
065ce6e742 add test 2018-11-12 23:48:53 +07:00
9d11cb4e9b update git readme vi 2018-11-12 22:57:45 +07:00
2e8a756862 update git 2018-11-11 00:09:55 +07:00
4e96f71c28 Fix typo in README_kr.md (#251)
글로버 -> 글로벌
2018-11-08 10:45:18 -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
9e15db0d59 Update spanish README (#246) 2018-11-01 16:04:04 -04:00
57c4e3bc59 Corrected link label in the TOC for fixing Travis-CI (#239) 2018-10-30 04:20:29 -04: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
9102de6186 Update Russian translation (#240) 2018-10-26 14:03:55 +02: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
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
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
661024bc32 Fix links markdown formats in Spanish translation (#220) 2018-10-23 14:26:08 +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
0b7921c8d5 I want to view the evolution of a function 2018-10-17 23:07:16 -03:00
9bc656bdcc Added cred helper info 2018-10-17 15:28:13 -04:00
d988a3ab10 add instructions for what to do if you add the wrong remote 2018-10-17 13:42:42 -04:00
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
c2ffba97eb I committed and pushed a merge that shouldn't have happened (#213) 2018-07-17 17:59:17 -04:00
8cfa8e476a Translate README_ru.md via GitLocalize (#210) 2018-07-09 16:50:20 -04:00
df439158b4 fix link 2018-06-14 10:40:04 -04:00
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
a06bef415e Add spanish translation (#119) 2018-05-14 12:40:45 -04:00
42472aaa94 Remove unnecessary tag 2018-05-14 12:37:08 -04:00
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
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
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
d8c55ae8c5 Fix misspelling (#206) 2018-02-05 09:01:13 -04:00
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
ea40bf75ca Translate README_ru.md via GitLocalize (#203) 2018-01-11 08:57:04 -05:00
fb27b20f1f Remove unnecessary anchor tags (#200) 2018-01-07 10:47:23 -05:00
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
be480c4c35 Merge pull request #201 from carusogabriel/patch-1
Possible mistake
2018-01-02 09:19:18 -03:00
3f85b185de Possible mistake 2018-01-02 07:30:25 -02:00
f9792e9c68 Clean up READMEs (#198)
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
2018-01-01 11:40:52 -06:00
590f63c7e6 Add colon 2017-12-30 12:26:44 -06:00
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
4dcb631734 Including snippet to list commits containing specific files (#197) 2017-12-30 12:57:11 -05:00
e4e6ee08b1 Add "I want to delete multiple branches" (#196) 2017-12-30 12:25:11 -05:00
26138f0f10 Fixed typo in git branch -rr invocation (#190) 2017-12-29 09:52:07 -05:00
68820c1dc3 Auto-check for translated pages README_*.md with Travis CI (#188) 2017-12-23 10:51:19 -05:00
84322067fe Updated Russian translations (#187) 2017-12-23 10:50:23 -05:00
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
697dbb404f Update CONTRIBUTE.md (#185)
gitlocalize repository url
2017-12-22 09:41:14 -05:00
423eaf0ede Merge pull request #183 from sotayamashita/feature/validate-links
Add travis config to validate links
2017-12-21 14:07:29 -05:00
ae8459b6da Missed this grammar bit 2017-12-20 20:39:16 -05:00
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
ca04c4bfb4 Added the Atlassian Git tutorial site (#181) 2017-12-20 16:08:19 -05:00
58fab97420 Fixed the typo for Sourcetree and updated the description (#180) 2017-12-19 22:12:56 -05:00
c91d1081c4 Add travis config to calidate links 2017-12-20 11:34:49 +09:00
e5039cc2b9 Rename zh-CN translation to be compatible with GitLocalize (#178) 2017-12-19 19:47:46 -05:00
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
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
da6f0f8e66 Branches - list branches (#171) 2017-12-16 11:50:00 -05:00
d6d5c6f920 fix a typo (#170) 2017-12-13 10:12:23 -05:00
4a6f537157 Merge pull request #166 from k88hudson/feat/set-head
Add an example using `set-head`
2017-12-12 13:06:54 -03:00
8d74313257 Add reset-author and no-edit to author rewriting (#169) 2017-12-12 08:56:52 -05:00
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
472f05caf0 Added section with links to every language (#167) 2017-12-10 14:07:30 -05:00
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
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
565b8259da Update Russian translations up to English source (#165) 2017-12-07 15:18:06 -05:00
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
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
02e357c5b4 Added russian translations (#161) 2017-12-02 15:09:14 -05:00
c128fff050 Iss-150: Fixed section about discarding local uncommitted changes (#160)
Iss-150: minor fix
2017-11-30 16:28:13 -05:00
5eaca03df3 Merge pull request #158 from juanca87/git-merge-abort
Added command to abort the merge
2017-11-28 11:14:27 -03:00
045015f66d Update README.md
Added a link to the description to abort the merge
2017-11-28 10:52:16 -03:00
5fc6b2289d Added command to abort the merge 2017-11-28 00:02:58 -03:00
f4c0fac6ef Add safety note for git reset --hard (#157)
resolves #155
2017-11-27 15:44:52 -05:00
7440fa32b5 Discard local uncommitted changes (#156) 2017-11-27 13:30:38 -05:00
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
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
8426f177dd Fix #149 @RichardLitt comment
Fix #149 PR merged
2017-11-23 21:41:39 -03:00
71f2ab2917 Merge pull request #149 from flexdinesh/master
flight-rule to stash multiple files at once
2017-11-23 12:05:22 -03:00
4bf16453c6 flight-rule to stash multiple files at once 2017-11-23 01:11:14 +05:30
7412b89d42 Merge pull request #147 from benyanke/patch-1
Added gitk
2017-11-21 16:33:36 -05:00
11c11ecc21 Update README.md 2017-11-21 13:23:03 -06:00
5088d30821 Add sample of -u option of git stash (#146) 2017-11-21 13:13:31 -05:00
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
4cb52c015c fix typo (#142) 2017-11-19 12:56:54 -05:00
9dafe52a63 fix typo (#141) 2017-11-19 12:56:42 -05:00
2e5498cd5c New Topic for 'Stashing' and curated frequent stash workflow (#140) 2017-11-19 03:34:21 -05:00
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
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
2637bf010f Add fork and gmaster (#137)
* add fork

* add fork
2017-11-16 15:34:47 -05:00
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
e51ba1db7d fix formatting 2017-11-15 09:08:38 -05:00
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
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
fc459528ea Revert a file to a specific revision (#131) 2017-11-13 09:09:15 -05:00
a38b385b03 Merge branch 'toptal-more-specific-removal-of-a-file-from-commit' 2017-11-12 10:31:53 -05:00
186ed0a1e4 docs: small grammar fix 2017-11-12 10:31:50 -05:00
f60cd9d835 Change command to avoid editing commit message 2017-11-12 18:16:13 +03:00
103e920531 Add fetching a GitHub PR ref directly (#129) 2017-11-12 08:10:33 -05:00
e2ddb7fe55 Added how to rename a local branch (#128) 2017-11-11 09:11:26 -05:00
4547f3ea98 Add git extensions to GUI Clients 2017-11-10 16:50:28 -05:00
17bf6d7cbd Add Magit (#126) 2017-11-10 16:30:45 -05:00
76361c407f Fix minor typo (#124) 2017-11-10 16:04:58 -05:00
545a53e808 Change the command to minimize side effects 2017-11-10 19:18:27 +03:00
88e905a4c2 Add Chinese translation (#121) 2017-11-09 08:18:10 -05:00
9f0a1d2ae3 Recommend --force-with-lease instead of --force (#117) 2017-11-07 09:19:44 -05:00
4a654bd90a Add Tig to the list of clients (#116)
* Update README.md

* Update README.md
2017-11-07 07:58:24 -05:00
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
1e80224456 Merge pull request #114 from arnavb/update-text
Minor Text Update
2017-11-06 20:16:13 -05:00
4bc70b6aab fix #112: Add cc-by-sa-4.0 license 2017-11-06 20:13:25 -05:00
7f2a4bfd03 Minor text update 2017-11-06 20:09:42 -05:00
7ebe86b76e Merge pull request #113 from Shayac/master
add learngitbranching tutorial
2017-11-06 19:42:30 -05:00
1883097a8b add learngitbranching tutorial 2017-11-06 19:22:35 -05:00
bfb67fc369 Merge pull request #111 from Shayac/master
Add Scott Chacon's other git book
2017-11-06 19:06:43 -05:00
20bb62b971 Add another git book 2017-11-06 18:25:54 -05:00
868005ed17 Merge pull request #109 from e-larrambebere/master
Fixes minor style issues
2017-11-06 08:42:43 -05:00
688ab59c2c Merge pull request #108 from thomasyimgit/checkout-remote-branch
add checkout to remote branch
2017-11-06 08:42:19 -05:00
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
485bcf6691 add checkout to remote branch 2017-11-05 21:02:03 -05:00
2a86ef478e Merge branch 'pr/106' 2017-06-05 12:08:59 +01:00
51d78e43c5 Adding stashes back in 2017-06-05 12:08:56 +01:00
998dd0c7fb Add git-town, alphabetize 2017-05-24 14:50:55 +01:00
542884da13 Improve "discard specific unstaged changes" steps 2017-04-09 16:20:44 +08:00
f3428ed7af Merge pull request #105 from Plsr/master
Use 'branch' instead of 'checkout -b'
2017-03-29 16:13:45 -04:00
5af92eed17 Use 'branch' instead of 'checkout -b' 2017-03-29 11:55:42 +02:00
a5d7eea0d5 Merge pull request #104 from camilortte/patch-1
Add Git Gui Client (GitKraken)
2017-01-16 14:40:08 -03:00
36c28e5ec2 Add Git Gui Cloent GitKraken 2017-01-11 16:46:43 -05:00
1cb8a5798f Merge pull request #102 from gaetan-petit/patch-1
ADD undo rebase/merge
2017-01-09 21:10:44 +01:00
5bad85aeba Update README.md 2017-01-08 00:32:15 +01:00
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
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
eb48bfc8ba add a new rule, how to discard specific unstaged changes 2016-12-29 15:34:11 -05:00
9478da7964 Update README.md 2016-12-21 17:43:59 +01:00
2b34d20485 ADD undo rebase/merge
Please correct my broken english :)
2016-12-21 17:42:00 +01:00
57b67d4843 Added section on staging and unstaging 2016-12-13 13:03:57 -05:00
25bb25a82f Merge pull request #99 from jwilk/spelling
Fix typos
2016-11-13 20:30:03 +09:00
e1d3f10f38 Merge pull request #100 from jwilk/alias-amend
Fix the "amend" alias
2016-11-13 20:29:17 +09:00
c483f0dfda Fix the "amend" alias 2016-11-12 16:11:50 +01:00
4744ae8733 Fix typos 2016-11-12 16:10:29 +01:00
2fa0b60933 Moved note to section 2016-08-01 21:20:33 -04:00
6d0c8e4910 Add rule about bringing changes from another ref-ish 2016-08-01 21:18:59 -04:00
abaa08d04a Update ToC 2016-08-01 21:08:05 -04:00
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
15fe42de67 add missing preposition 2016-02-22 17:54:12 +03:00
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
aef9e07efc Merge pull request #95 from alvarogarcia7/patch-2
prefer using official (bogus) domain name
2016-02-15 12:55:57 -05:00
f47b2e66f5 Merge pull request #96 from alvarogarcia7/patch-3
for privacy, hide emails
2016-02-15 12:55:42 -05:00
f852094458 for privacy, hide emails 2016-02-15 00:45:06 +01:00
8ebbb29f48 prefer using official (bogus) domain name 2016-02-15 00:43:35 +01:00
35715611d4 add another way of seeing the last committed diff 2016-02-15 00:38:20 +01:00
7c76618f2e add some simpler ways to do the same things and a bit more info 2016-02-13 01:13:36 +03:00
a289c22e73 Merge pull request #92 from adjavaherian/master
Credential helper
2015-12-17 18:49:13 -05:00
efafa0dec3 Merge pull request #1 from adjavaherian/adjavaherian-credential-helper
Adding a rule for caching username and password
2015-12-17 12:53:22 -08:00
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
8e4d72dbc8 Added git fire
🔥
2015-10-05 10:40:27 -04:00
9740678d01 Merge branch 'magalhini-recover-deleted-tag' 2015-10-02 08:54:31 -04:00
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
a98fcf9f13 Merge pull request #91 from orthographic-pedant/spell_check/accidentally
Fixed typographical error, changed accidentaly to accidentally in README.
2015-09-30 13:26:26 -04:00
792e0deb23 Fixed typographical error, changed accidentaly to accidentally in README. 2015-09-30 13:11:12 -04:00
7bce1f9570 Merge pull request #88 from RichardLitt/feature/62-restructure-doc
Restructured document, closes #62
2015-09-27 08:46:46 -07:00
01eddd2ca7 Restructured document, closes #62 2015-09-27 11:45:45 -04:00
0bd7dbd106 Consistent naming of tags. 2015-09-27 17:35:43 +02:00
6fa3e0c7d9 Add instructions to recover a deleted tag. 2015-09-27 17:28:04 +02:00
08ac820a33 Merge pull request #87 from RichardLitt/feature/remove-files-from-commit
Added workflow for removing file from commit
2015-09-23 11:43:02 -04:00
1edbba171b Added workflow for removing file from commit 2015-09-23 11:42:36 -04:00
3c736dfa26 Merge pull request #86 from appleboy/patch-1
Add another way to change the commit message.
2015-09-03 22:59:08 -04:00
cb168abd45 update comment. 2015-09-04 10:32:37 +08:00
184bcc1ddf Add another way to change commit message. 2015-09-04 08:55:25 +08:00
d417eedd3b Merge pull request #77 from RichardLitt/feature/edit-amend
Added more text to amend section to explain when it is good to edit a…
2015-09-03 16:07:37 -04:00
65e60c8e89 Merge pull request #79 from RichardLitt/feature/delete-branch
Added explanation for deleting a branch
2015-09-03 16:05:04 -04:00
1798a7d4c0 Added explanation for deleting a branch 2015-09-03 15:56:51 -04:00
5b935d5597 Merge pull request #80 from RichardLitt/feature/reset-single-file
Added explanation for reseting a single file
2015-09-03 15:56:49 -04:00
6f8ab94610 Merge pull request #81 from RichardLitt/feature/standardize-syntax
Standardized branch names to my-branch, added missing dollar signs, a…
2015-09-03 15:50:43 -04:00
21fca93ac2 Merge pull request #82 from RichardLitt/feature/add-gitup
Added GitUp into resources
2015-09-03 15:39:05 -04:00
11cf3c92de Merge pull request #83 from RichardLitt/feature/github-workflow
Added GitHub as a workflow
2015-08-25 14:53:15 -04:00
9029bda973 Merge pull request #84 from RichardLitt/feature/reflog
Added a section about reflog, closes #2
2015-08-25 14:46:04 -04:00
927ca07ff8 Added a section about reflog, closes #2 2015-08-25 14:37:06 -04:00
50780dc043 Added GitHub as a workflow 2015-08-25 14:27:12 -04:00
97cada4381 Added GitUp into resources 2015-08-20 12:09:59 -04:00
48cce8af6c Standardized branch names to my-branch, added missing dollar signs, and fixed some cases where the order wasn't right. Also added sh to all code blocks where needed, and added vim to blocks showing the interactive editor. This closes #76. 2015-08-19 13:48:42 -04:00
eb73619120 Added explanation for reseting a single file 2015-08-18 16:03:44 -04:00
bad8c7f6b0 Merge pull request #78 from RichardLitt/feature/remove-cleanup
Merged two questions, as revert applies to both
2015-08-18 16:01:26 -04:00
a9cb62514a Merged two questions, as revert applies to both 2015-08-18 15:57:09 -04:00
6722c72350 Added more text to amend section to explain when it is good to edit a commit 2015-08-18 15:53:51 -04:00
4622e309f1 Merge pull request #74 from RichardLitt/feature/capitalization
Added example for changing capitalization of a file
2015-08-18 15:27:11 -04:00
4f9e6fff47 Merge pull request #75 from RichardLitt/feature/contribute
Added a contribute file
2015-08-18 15:26:44 -04:00
ad0dd58329 Added a contribute file 2015-08-18 11:24:27 -04:00
ca934fe3ff Added example for changing capitalization of a file 2015-08-18 11:11:17 -04:00
e046ac055c Merge pull request #73 from RichardLitt/feature/add-partial-new-file
Add solution for interactively patching part of a new file
2015-08-09 20:18:37 -04:00
a1adec8fe4 Add solution for interactively patching part of a new file 2015-08-09 15:20:45 -04:00
aefbf8fa39 Merge pull request #71 from RichardLitt/feature/git-tips
Added git tips
2015-07-16 14:16:36 -04:00
3260154b76 Added git tips 2015-07-16 14:16:06 -04:00
1e74631336 Merge pull request #72 from appleboy/patch-1
Add GIT utilities
2015-07-16 14:14:10 -04:00
8434388e49 Add GIT utilities 2015-07-16 20:05:27 +08:00
896d792a27 Merge pull request #70 from RichardLitt/feature/undo-reset-hard
How to undo a hard reset
2015-07-05 11:29:52 -04:00
1bb6a708ec How to undo a hard reset 2015-07-03 16:22:51 -04:00
cdef6a1274 Merged two answers 2015-07-03 16:20:02 -04:00
875c49d0d1 Added good rebase and merge tutorial 2015-06-30 13:29:52 -04:00
02e9ec921f Merge pull request #63 from RichardLitt/feature/merged-commits
Added note about checking for merged branches
2015-06-01 09:48:25 +08:00
84d543db7d Added note about checking for merged branches
This should check if your commits are fully merged or not. Mostly taken from
http://stackoverflow.com/questions/7548926/git-and-the-branch-x-is-not-fully-merged-error.
2015-06-01 09:47:33 +08:00
a4af688a5c Merge pull request #69 from unixorn/master
Break GUI clients out into separate section
2015-05-26 08:21:39 +07:00
7792dac8f7 Doctoc update 2015-05-24 22:35:52 -07:00
34a83f3efa Add GUI Clients section 2015-05-24 22:35:34 -07:00
a02899c748 Add Tower client 2015-05-24 22:26:56 -07:00
a3e2e70fa1 Fixed header 2015-05-22 09:26:54 +07:00
78f470427c Merge pull request #68 from RichardLitt/master
FirstAidGit
2015-05-22 09:16:59 +07:00
a5c51421c3 Merge branch 'feature/first-aid-git' 2015-05-22 09:15:55 +07:00
c0bd172d03 Merge branch 'feature/first-aid-git' of git://github.com/k88hudson/git-flight-rules into feature/first-aid-git 2015-05-22 09:15:19 +07:00
b8bb75da0f Added firstaidgit.io
Closes #54.
2015-05-22 09:14:45 +07:00
a8e6825f90 Merge pull request #67 from unixorn/add-more-resources
Add more git clients, Add Book section to Other Resources
2015-05-22 09:11:05 +07:00
45c63ac9f4 Add book section 2015-05-21 19:02:08 -07:00
ff99d75be1 Add git-cola 2015-05-21 19:00:08 -07:00
44ebb19dbb Add gitx-dev link 2015-05-21 18:58:21 -07:00
eaa3353fa2 Merge pull request #66 from unixorn/update-doctoc
Forgot to run doctoc after adding 'Other Resources' section
2015-05-20 08:42:59 +07:00
67ed4f0ea5 Forgot to run doctoc after adding 'Other Resources' section 2015-05-19 10:52:56 -07:00
f9b72fe495 Added firstaidgit.io
Closes #54.
2015-05-20 00:47:29 +07:00
efb1619f25 Merge pull request #64 from unixorn/master
Add "Other Resources" section
2015-05-20 00:45:32 +07:00
64182bca50 Add Other resources section
* Add link to git-workflow - closes #59
* Add link to git-extra-commands collection of helper scripts
* Add link to source tree
2015-05-19 10:40:24 -07:00
a9b0361a88 Strip trailing spaces 2015-05-19 10:40:03 -07:00
264d3dde33 Merge pull request #61 from RichardLitt/feature/deleted-fork
Added a section about deleted PRs
2015-05-20 00:19:46 +07:00
1b4cad1552 Added a section about deleted PRs 2015-05-19 14:23:25 +07:00
aeaa38e922 Merge pull request #60 from RichardLitt/feature/arialdomartini
`git reset --hard master~1` rather than `git reset --hard a13b85e`
2015-05-19 14:15:27 +07:00
b0c20c4804 Added explanation of HEAD, kept past example 2015-05-19 14:13:19 +07:00
6a23217314 Using git reset --hard HEAD^, as suggested by @konrado0905 2015-05-19 14:11:34 +07:00
e4fe866e14 Merge pull request #56 from RichardLitt/force-push-rebase
Rebasing and force pushing
2015-05-16 01:37:47 +07:00
d673566e0d Rebasing and force pushing 2015-05-15 13:24:00 +07:00
08bbf9a967 Merge pull request #58 from RichardLitt/master
Merge stuartpb-patch-2
2015-05-15 13:21:03 +07:00
a32ec5590e Merge branch 'stuartpb-patch-2' 2015-05-15 13:20:02 +07:00
1a993cec3e Added text, moved to appropriate section 2015-05-15 13:19:52 +07:00
5a0f04c8e9 Merge branch 'patch-2' of https://github.com/stuartpb/git-flight-rules into stuartpb-patch-2 2015-05-15 13:14:04 +07:00
8c4e12be63 Merge pull request #57 from RichardLitt/feature/commits-to-old-branch
Added two sections for moving unstaged edits
2015-05-14 05:31:22 +07:00
9f1fbc5861 Added two sections for moving unstaged edits
I often want to add commits to a new branch, and to an old branch that is empty, but I forget how. Here it is.
2015-05-11 14:00:59 +07:00
0f7027159a Merge pull request #55 from RichardLitt/master
Merge
2015-04-26 18:19:47 +08:00
8c5b442718 Merge branch 'stuartpb-patch-1' 2015-04-26 18:19:00 +08:00
bec92700e4 Merge 2015-04-26 18:18:50 +08:00
2ebceca748 Merge pull request #53 from unixorn/master
Minor typo fix, remove trailing spaces
2015-04-21 14:31:46 +07:00
ab17fbc6ab Minor typo fix, remove trailing spaces 2015-04-20 23:39:46 -07:00
597bde6d7b Merge pull request #52 from RichardLitt/master
Merged in the Delete PR
2015-03-23 11:17:34 +08:00
caf8d3c8b4 Made a deleting category 2015-03-23 11:15:55 +08:00
08ced44cd3 Merge branch 'patch-1' of https://github.com/dandv/git-flight-rules into dandv-patch-1
# Conflicts:
#	README.md
2015-03-23 11:13:54 +08:00
2bf72a4ec4 Merge pull request #51 from RichardLitt/master
RM tips
2015-03-21 10:16:18 +08:00
46aff394db Merge branch 'jm-tips' of https://github.com/xinsight/git-flight-rules into xinsight-jm-tips 2015-03-21 10:13:04 +08:00
0fe348620e Merge pull request #50 from RichardLitt/master
Removed second force-push section
2015-03-20 20:42:15 +08:00
d718c438ee Removed second force-push section
This commit was in #18, first.
2015-03-20 20:39:57 +08:00
17dea4c558 Merge pull request #49 from RichardLitt/master
Doctoc fixes. :|
2015-03-16 13:18:55 -07:00
974505558f Doctoc fixes. :| 2015-03-16 13:18:19 -07:00
6f9d0f8797 Merge pull request #48 from RichardLitt/gitter-badger-gitter-badge
Gitter
2015-03-16 13:15:04 -07:00
fed9948810 Merge branch 'gitter-badge' of https://github.com/gitter-badger/git-flight-rules into gitter-badger-gitter-badge 2015-03-16 13:14:01 -07:00
a9bfc9f52a Merge pull request #47 from RichardLitt/master
PR Feedback
2015-03-16 13:10:29 -07:00
d5d405fbbf Merge branch 'camwes-patch-1' 2015-03-16 13:09:56 -07:00
c108121f94 Doctoc 2015-03-16 13:09:41 -07:00
fc5d15e54c Merge branch 'patch-1' of https://github.com/camwes/git-flight-rules into camwes-patch-1 2015-03-16 13:09:15 -07:00
88252b2d91 PR feedback 2015-03-16 12:15:05 -07:00
b1016fbeb9 Merge pull request #46 from RichardLitt/master
Merge Josh dutcher
2015-03-16 10:21:17 -07:00
0ecf651254 Doctoc, closes #35 2015-03-16 10:20:18 -07:00
a52d5152d8 Merge branch 'joshdutcher-master' 2015-03-16 10:20:05 -07:00
5b0a37cfdd Merge branch 'master' of https://github.com/joshdutcher/git-flight-rules into joshdutcher-master
# Conflicts:
#	README.md
2015-03-16 10:19:49 -07:00
ea87639b03 added 'pulled from/into the wrong branch' 2015-03-16 12:11:41 -05:00
0e64bc4cb5 Merge pull request #45 from RichardLitt/master
Moved doctoc
2015-03-16 09:33:56 -07:00
49c3e94217 Moved doctoc 2015-03-16 09:33:13 -07:00
80854f6e60 Alignment
We're going to have to keep tabs on this, doesn't seem perfect.
2015-03-16 09:22:16 -07:00
50bf10c986 Merge pull request #44 from RichardLitt/master
Moved header
2015-03-16 09:21:27 -07:00
c8e0049af6 Moved header 2015-03-16 09:20:51 -07:00
108aa058f0 Merge pull request #38 from RichardLitt/toc
Added TOC using npm module doctoc
2015-03-16 09:19:25 -07:00
5b6dfb05c9 Added TOC using npm module doctoc
This should automatically update. All it takes on the maintainer's end
is to `npm install -g doctoc`, and run it once in the file. I like
the look of it, and I think this solves the issue in one command nicely.
This is made to deal with #10.
2015-03-16 09:18:49 -07:00
92211c458f Added Gitter badge 2015-03-14 18:51:22 +00:00
19c8ad3ab9 Added then
This makes it clear that `git rebase` is not a check to see if master is up to date. #3
2015-03-14 11:06:23 -07:00
a2d407f12e Merge pull request #42 from RichardLitt/git-commit-wrong-branch-33
Added note about git push
2015-03-14 10:26:29 -07:00
34e4f3e39b Added note about git push
This reflects that your origin will be out of sync with remote if you reset. Just a small note. I noticed this when testing #33
2015-03-14 10:25:34 -07:00
660a9b59ca Merge pull request #28 from unixorn/add-missing-anchor-tag
Add missing anchor tag
2015-03-13 18:01:23 -04:00
7ad2b8db96 Merge remote-tracking branch 'upstream/master' into add-missing-anchor-tag 2015-03-13 14:03:03 -07:00
1ddfc1707d Merge pull request #41 from k88hudson/circosta
fixes typo
2015-03-13 15:00:18 -04:00
0a2f618d0f Add a few recipes 2014-11-30 17:21:34 -08:00
a4a708b9df Add missing anchor tag 2014-08-22 14:08:27 -07:00
a53267fd27 Add "I need to undo my last commit" 2014-08-14 12:01:43 -07:00
abb085de05 Add "Oh crap, what did I just commit" 2014-08-14 11:46:47 -07:00
9f20e13e41 fix prompt to match style guide 2014-07-31 23:21:46 -04:00
36b4aadc11 add 4 tips 2014-07-31 23:16:43 -04:00
978e484967 Update README.md 2014-07-29 11:53:00 -07:00
14 changed files with 16295 additions and 192 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

46
CONTRIBUTE.md Normal file
View File

@ -0,0 +1,46 @@
# Contributing
This is a community built document. Dive in and help out!
### Issues
- Please jump in and help us out by making PRs for open issues.
- If you see anything you'd think could be improved, feel free to open an issue. This doesn't just mean for new additions you'd like to see - although those are very appreciated, too.
### Pull Requests
- Please title your pull requests appropriately, summing up what your commits are about.
- Make sure that your submission doesn't exist somewhere else in the document.
- If you can, run `doctoc README.md` before adding a new section, or after editing a section - this keeps the Table of Contents up to date. If you don't have it, you can install [DocToc here](https://github.com/thlorenz/doctoc).
- Include the relevant branch before the `$` in a shell command, if needed. If not needed, please do not include a branch name.
- Please label code blocks as `sh` to help out [linguist](https://github.com/github/linguist), unless the language is different.
- Try and put relevant flight rules in the same general area of the document - deletes with deletes, commit amends with commit amends, and so on. We're working on making this better, so no worries if it is confusing - just throw the submission on the end.
- Link to places you found answers or procedures if especially complicated, or if linking to a larger discussion of how to do something. This normally means linking to Stack Overflow.
- Generally, conform to this schema:
<a name="example-title"></a>
# Example Title
Brief description of the problem.
```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.

2086
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

1637
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

1580
README_kr.md Normal file

File diff suppressed because it is too large Load Diff

1959
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

1948
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"
}
}