Commit Graph

253 Commits

Author SHA1 Message Date
Tommy Williams 8e697833ae Add shortcuts information for Windows PowerShell (#263) 2018-12-11 12:29:13 -05:00
Richard Littauer 73547ca942
Add pcottle/learnGitBranching (#262) 2018-12-06 14:12:33 -05:00
abdel ali 3d6c00dded Git shortcuts (#261)
* I committed and pushed a merge that shouldn't have happened

* git shortcuts

* remove extra commands in git shortcut section
2018-12-06 14:12:13 -05:00
Richard Littauer 8b09e3fb58 Slight wording changes 2018-12-06 09:55:45 -05:00
nielsonm 5cfcca513c Add section on `reset -p` to unstage edits
Expanded  explanation & corrected bad grammar.
2018-12-06 09:55:42 -05:00
Richard Littauer b67b184d8a Merge branch 'nzachow-master' 2018-11-29 14:17:40 -05:00
Richard Littauer ee10f43326 Adding a period. 2018-11-29 14:17:35 -05:00
Richard Littauer 0d109a7f9c Merge branch 'm007-master' 2018-11-29 14:12:12 -05:00
Richard Littauer 1877d108b0 Small wording changes 2018-11-29 14:12:07 -05:00
Matthias Baumgarten 42b5519891 Wording improvements due to review comments
Like discussed in the PR this commit improves the quested section
regarding lesser spelling mistakes and improved wording. The discussion
about --no-edit lead to no changes required, so it is not altered.

See https://github.com/k88hudson/git-flight-rules/pull/256
2018-11-29 20:00:27 +01:00
Timo Sand 9d16c95ee1 Adds a few useful git aliases (#258)
Addresses #225
2018-11-29 11:28:21 -05:00
Richard Littauer 7cb8c1a105 Merge branch 'grantslone-master' 2018-11-28 08:56:04 -05:00
Richard Littauer bbcb8f6704 Small grammar edits 2018-11-28 08:56:01 -05:00
Richard Littauer 8854c326b9 Merge branch 'retiform-master' 2018-11-28 08:48:05 -05:00
Richard Littauer d6e98fd537 Small spelling and style changes 2018-11-28 08:47:50 -05:00
Cole bd388a89c5
Update README.md 2018-11-27 23:01:22 -05:00
Cole ca49abe067
Update README.md 2018-11-27 23:00:21 -05:00
Cole 8809567e7a
Update README.md 2018-11-27 22:59:54 -05:00
Cole 9b54d14dff
Update README.md 2018-11-27 22:57:52 -05:00
Cole 066cf428e1
Update README.md 2018-11-27 22:56:06 -05:00
Samy Kacimi a3ece44263 add french (fr) translation (#252) 2018-11-27 14:43:27 -05:00
Matthias Baumgarten ebfe5dae13 Add section on how to modify an arbitrary commit
Explain how to solve situations where you want to modify a commit which
is not your last by using interactive rebase.
2018-11-20 18:16:58 +01:00
cyblue9 4b6e19a5ea Fix typo (#254) 2018-11-14 18:28:44 -05:00
hoannc 23e4b8d4f3 run doctoc 2018-11-14 07:42:26 -05:00
joseph ba88c82f94 added a section for unstaging a staged file. (#243)
I have accidentally staged many files in my working copy, and was looking for a way to unstage them by filename as I had some staged files that I wanted to keep. Didn't see anything that addressed my specific issue on the README, so thought of adding it here.
2018-11-04 16:35:56 -05:00
Cam Hardy 913e8285aa Update readme en (#242)
* added guide for amending sensitive data that was committed/pushed

* added formatting and more solutions for amending sensitive data

* added a few sentences to explain why any sensitive data should be considered compromised once it's been committed
2018-10-30 04:19:23 -04:00
Jake efb35a9607 Telling Git to ignore a local change without unversioning the file (#219)
Ignoring local changes can be really handy for creds/credfile templates, I've found it particularly handy with Discord bot development where the configuration file can have an expected structure and expects you to add tokens to that config file
2018-10-24 19:15:19 +02:00
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
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
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
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
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
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
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