Commit Graph

288 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
hgautham c128fff050 Iss-150: Fixed section about discarding local uncommitted changes (#160)
Iss-150: minor fix
2017-11-30 16:28:13 -05: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
Dinesh 4bf16453c6 flight-rule to stash multiple files at once 2017-11-23 01:11:14 +05:30
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
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
Arnav Borborah 7f2a4bfd03
Minor text update 2017-11-06 20:09:42 -05:00
Shaya Cohen 1883097a8b add learngitbranching tutorial 2017-11-06 19:22:35 -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
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
plsr 5af92eed17 Use 'branch' instead of 'checkout -b' 2017-03-29 11:55:42 +02: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