Skip to content

Commit 1ac4dac

Browse files
author
Jordan McCullough
committed
Merge pull request #67 from github/cheat-sheet-adjustments
Cheat sheet content adjustments
2 parents fde1810 + 45d102f commit 1ac4dac

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

downloads/github-git-cheat-sheet.md

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@ Git is the open source distributed version control system that facilitates GitHu
66
GitHub provides desktop clients that include a graphical user interface for the most common repository actions and an automatically updating command line edition of Git for advanced scenarios.
77

88
### GitHub for Windows
9-
https://windows.github.com
9+
http://windows.github.com
1010

1111
### GitHub for Mac
12-
https://mac.github.com
12+
http://mac.github.com
1313

1414
Git distributions for Linux and POSIX systems are available on the official Git SCM web site.
1515

16-
###Git for All Platforms
16+
###Git for all platforms
1717
http://git-scm.com
1818

1919
## Configure tooling
2020
Configure user information for all local repositories
2121

2222
```git config --global user.name "[name]"```
23-
Set your name that will be recorded for commit transactions
23+
Set the name you want attached to your commit transactions
2424

2525
```git config --global user.email "[email address]"```
26-
Set your email address that will be saved for commit transations
26+
Set the email you want attached to your commit transactions
2727

2828
```git config --global color.ui auto```
2929
Enable helpful colorization of command line output
@@ -54,7 +54,7 @@ Snapshot the file in preparation for versioning
5454
Show file differences between staging and the last file version
5555

5656
```git reset [file]```
57-
Remove the file from the staging area
57+
Unstage the file, but preserve its contents
5858

5959
```git commit -m"[descriptive message]"```
6060
Record file snapshots permanently in version history
@@ -63,16 +63,16 @@ Record file snapshots permanently in version history
6363
Name a series of commits and combine completed efforts
6464

6565
```git branch```
66-
List all local branches to the current repository
66+
List all local branches in the current repository
6767

6868
```git branch [branch-name]```
6969
Create a new branch
7070

7171
```git checkout [branch-name]```
72-
Switch branches with respect to its specific commits
72+
Switch to the specified branch and update working directory
7373

7474
```git merge [branch-name]```
75-
Combine the specified branch’s history into the current one
75+
Combine the specified branch’s history into the current branch
7676

7777
```git branch -d [branch-name]```
7878
Delete the specified branch
@@ -82,10 +82,10 @@ Delete the specified branch
8282
Relocate and remove versioned files
8383

8484
```git rm [file]```
85-
Delete the file from the project prepare the removal for commit
85+
Delete the file from the working directory and stage the deletion
8686

8787
```git rm --cached [file]```
88-
Remove the file from version control but keep in project directory
88+
Remove from version control but preserve the file locally
8989

9090
```git mv [file-original] [file-renamed]```
9191
Change the filename and prepare it for commit
@@ -98,49 +98,49 @@ Exclude temporary files and paths
9898
build/
9999
temp-*
100100
```
101-
Create a _.gitignore_ text file supress accidental versioning of files and paths matching the specified glob patterns
101+
A text file named `.gitignore` suppresses accidental versioning of files and paths matching the specified patterns
102102

103103
```git ls-files --other --ignored --exclude-standard```
104-
List all ignore pattern matched files in project
104+
List all ignored files in this project
105105

106106
## Save fragments
107107
Shelve and restore incomplete changes
108108

109109
```git stash```
110-
Temporarily store all modified, tracked files
110+
Temporarily store all modified tracked files
111111

112112
```git stash pop```
113-
Restore the most recent stashed files
113+
Restore the most recently stashed files
114114

115115
```git stash list```
116-
List all shelved changes
116+
List all stashed changesets
117117

118118
```git stash drop```
119-
Discard the most recent stashed files
119+
Discard the most recently stashed changeset
120120

121121
## Review history
122122
Browse and inspect the evolution of project files
123123

124124
```git log```
125-
List all version history for the current branch
125+
List version history for the current branch
126126

127127
```git log --follow [file]```
128-
List version history for a file and possible renames
128+
List version history for a file, including renames
129129

130130
```git diff [first-branch]...[second-branch]```
131131
Show content differences between two branches
132132

133133
```git show [commit]```
134-
Output all details of the specified commit
134+
Output metadata and content changes of the specified commit
135135

136136
## Redo commits
137137
Erase mistakes and craft replacement history
138138

139139
```git reset [commit]```
140-
Undo all commits after commit while preserving changes
140+
Undo all commits after [commit], preserving changes locally
141141

142142
```git reset --hard [commit]```
143-
Discard all history and changes back to specified commit
143+
Discard all history and changes back to the specified commit
144144

145145
## Synchronize changes
146146
Register a repository bookmark and exchange version history
@@ -155,7 +155,7 @@ Combine bookmark’s branch into into current local brancha
155155
Upload all local branch commits to GitHub
156156

157157
```git pull```
158-
Sychronize bookmark history and current branch all at once
158+
Sychronize bookmark history and incorporate current branch changes
159159

160160
---
161161

0 commit comments

Comments
 (0)