Commit Graph

447 Commits (master)
 

Author SHA1 Message Date
Timo Sand 9d16c95ee1 Adds a few useful git aliases (#258)
Addresses #225
6 years ago
Sylvain Abélard c9cfb71843 README_fr.md - replacing weird characters (#259)
Thanks for the translation!
6 years ago
Richard Littauer 4b5cad207a Use npm scripts for travis commands 6 years ago
Richard Littauer db69499594 Ran doctoc again 6 years ago
Richard Littauer 7cb8c1a105 Merge branch 'grantslone-master' 6 years ago
Richard Littauer bbcb8f6704 Small grammar edits 6 years ago
Richard Littauer 8854c326b9 Merge branch 'retiform-master' 6 years ago
Richard Littauer d6e98fd537 Small spelling and style changes 6 years ago
Cole bd388a89c5
Update README.md 6 years ago
Cole ca49abe067
Update README.md 6 years ago
Cole 8809567e7a
Update README.md 6 years ago
Cole 9b54d14dff
Update README.md 6 years ago
Cole 066cf428e1
Update README.md 6 years ago
Samy Kacimi a3ece44263 add french (fr) translation (#252) 6 years ago
Jay Two 911089c406 Update README_kr.md (#257)
edit typo 🇰🇷
6 years ago
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.
6 years ago
cyblue9 4b6e19a5ea Fix typo (#254) 6 years ago
cyblue9 f4037ec5c1 Fix option to amend commit message (#255) 6 years ago
Richard Littauer 20e4b2c10d Merge branch 'hoannc54-master' 6 years ago
hoannc 23e4b8d4f3 run doctoc 6 years ago
hoannc bd9af24828 update 6 years ago
hoannc bbbead4bcd add test 2 6 years ago
hoannc 065ce6e742 add test 6 years ago
hoannc 9d11cb4e9b update git readme vi 6 years ago
hoannc 2e8a756862 update git 6 years ago
yongsun-park 4e96f71c28 Fix typo in README_kr.md (#251)
글로버 -> 글로벌
6 years ago
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.
6 years ago
Moisés Ñañez 9e15db0d59 Update spanish README (#246) 6 years ago
Artem Buslov 57c4e3bc59 Corrected link label in the TOC for fixing Travis-CI (#239) 6 years ago
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
6 years ago
Artem Buslov 9102de6186 Update Russian translation (#240) 6 years ago
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
6 years ago
Henry Darnell c767e4b22a Add rebase --onto details (#231) 6 years ago
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.
6 years ago
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
6 years ago
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
6 years ago
Richard Littauer 02d9745c00
Add note about Git version (#217)
See #216. @ramiro how does this look?
6 years ago
Ricardo Lopes 965b320695 Add more resources to the list (#227)
* Add more tutorials to the list

* Add another book to the list
6 years ago
Victorhck 661024bc32 Fix links markdown formats in Spanish translation (#220) 6 years ago
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.
6 years ago
Nicolas Zachow 0b7921c8d5 I want to view the evolution of a function 6 years ago
grantslone 9bc656bdcc Added cred helper info 6 years ago
retiform d988a3ab10 add instructions for what to do if you add the wrong remote 6 years ago
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차 종료후 점검

* 점검 후 첫 완료

* 오타 수정 몇가지 수정

* 네비게이션 링크 추가

* 표현 수정
6 years ago
abdel ali c2ffba97eb I committed and pushed a merge that shouldn't have happened (#213) 6 years ago
Artem Buslov 8cfa8e476a Translate README_ru.md via GitLocalize (#210) 6 years ago
Richard Littauer df439158b4 fix link 6 years ago
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.
6 years ago
Moisés Ñañez a06bef415e Add spanish translation (#119) 6 years ago
Richard Littauer 42472aaa94 Remove unnecessary tag 6 years ago