From 0e53a8a500b75a0b60a88b9830825fda3c06bbf8 Mon Sep 17 00:00:00 2001 From: Milo Gilad Date: Mon, 31 Jul 2017 10:26:51 -0400 Subject: Small changes to git docs * Added command to add all files in the working tree to the staging area * Fixed some markdown code formatting mistakes * Fixed some grammatical mistakes * Fixed some spelling mistakes --- git.html.markdown | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/git.html.markdown b/git.html.markdown index 01dc92c1..e2376176 100644 --- a/git.html.markdown +++ b/git.html.markdown @@ -8,6 +8,7 @@ contributors: - ["Bruno Volcov", "http://github.com/volcov"] - ["Andrew Taylor", "http://github.com/andrewjt71"] - ["Jason Stathopulos", "http://github.com/SpiritBreaker226"] + - ["Milo Gilad", "http://github.com/Myl0g"] filename: LearnGit.txt --- @@ -23,7 +24,7 @@ manage your source code. Version control is a system that records changes to a file(s), over time. -### Centralized Versioning VS Distributed Versioning +### Centralized Versioning vs. Distributed Versioning * Centralized version control focuses on synchronizing, tracking, and backing up files. @@ -157,6 +158,7 @@ $ git init --help To intentionally untrack file(s) & folder(s) from git. Typically meant for private & temp files which would otherwise be shared in the repository. + ```bash $ echo "temp/" >> .gitignore $ echo "private_key" >> .gitignore @@ -189,6 +191,9 @@ $ git add /path/to/file/HelloWorld.c # Regular Expression support! $ git add ./*.java + +# You can also add everything in your working directory to the staging area. +$ git add -A ``` This only adds a file to the staging area/index, it doesn't commit it to the @@ -226,7 +231,7 @@ Manage your tags $ git tag # Create a annotated tag -# The -m specifies a tagging message,which is stored with the tag. +# The -m specifies a tagging message, which is stored with the tag. # If you don’t specify a message for an annotated tag, # Git launches your editor so you can type it in. $ git tag -a v2.0 -m 'my version 2.0' @@ -526,12 +531,12 @@ $ git reset --hard 31f2bb1 Reflog will list most of the git commands you have done for a given time period, default 90 days. -This give you the a change to reverse any git commands that have gone wrong -for instance if a rebase is has broken your application. +This give you the chance to reverse any git commands that have gone wrong (for instance, if a rebase has broken your application). You can do this: 1. `git reflog` to list all of the git commands for the rebase + ``` 38b323f HEAD@{0}: rebase -i (finish): returning to refs/heads/feature/add_git_reflog 38b323f HEAD@{1}: rebase -i (pick): Clarify inc/dec operators -- cgit v1.2.3 From 4d29f3f988e5612fa18c17066d9e00097b7b9149 Mon Sep 17 00:00:00 2001 From: Milo Gilad Date: Mon, 31 Jul 2017 10:30:24 -0400 Subject: Keeping lines under 80 chars --- git.html.markdown | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git.html.markdown b/git.html.markdown index e2376176..1cd2578e 100644 --- a/git.html.markdown +++ b/git.html.markdown @@ -531,7 +531,8 @@ $ git reset --hard 31f2bb1 Reflog will list most of the git commands you have done for a given time period, default 90 days. -This give you the chance to reverse any git commands that have gone wrong (for instance, if a rebase has broken your application). +This give you the chance to reverse any git commands that have gone wrong +(for instance, if a rebase has broken your application). You can do this: -- cgit v1.2.3