8000 Merge branch 'master' into patch-1 · nirajkvinit/github-cheat-sheet@01fa8a4 · GitHub
[go: up one dir, main page]

Skip to content

Commit 01fa8a4

Browse files
authored
Merge branch 'master' into patch-1
2 parents 2e99847 + 763a475 commit 01fa8a4

File tree

2 files changed

+22
-20
lines changed

2 files changed

+22
-20
lines changed

.travis.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ before_script:
77
- gem install awesome_bot
88

99
script:
10-
- awesome_bot README.md --allow-dupe --allow-redirect --white-list https://github.com/rails/rails/compare/master@,http://git.io/abc123,https://github.com/...,youtube,chrome.google.com/webstore,https://github.com/mathiasbynens/dotfiles/blob/master/.gitconfig*,https://github.com/user/repo/compare/
11-
- awesome_bot README.ko.md --allow-dupe --allow-redirect --white-list https://github.com/rails/rails/compare/master@,http://git.io/abc123,https://github.com/...,youtube,chrome.google.com/webstore,https://github.com/mathiasbynens/dotfiles/blob/master/.gitconfig*,https://github.com/user/repo/compare/
12-
- awesome_bot README.ja.md --allow-dupe --allow-redirect --white-list https://github.com/rails/rails/compare/master@,http://git.io/abc123,https://github.com/...,youtube,chrome.google.com/webstore,https://github.com/mathiasbynens/dotfiles/blob/master/.gitconfig*,https://github.com/user/repo/compare/
13-
- awesome_bot README.zh-cn.md --allow-dupe --allow-redirect --white-list https://github.com/rails/rails/compare/master@,http://git.io/abc123,https://github.com/...,youtube,chrome.google.com/webstore,https://github.com/mathiasbynens/dotfiles/blob/master/.gitconfig*,https://github.com/user/repo/compare/
14-
- awesome_bot README.zh-tw.md --allow-dupe --allow-redirect --white-list https://github.com/rails/rails/compare/master@,http://git.io/abc123,https://github.com/...,youtube,chrome.google.com/webstore,https://github.com/mathiasbynens/dotfiles/blob/master/.gitconfig*,https://github.com/user/repo/compare/
10+
- wl=https://github.com/rails/rails/compare/master@,http://git.io/abc123,https://github.com/..,youtube,chrome.google.com/webstore,https://github.com/mathiasbynens/dotfiles/blob/master/.gitconfig*,https://github.com/user/repo/compare/,vimeo
11+
- awesome_bot README.md --allow-dupe --allow-redirect --white-list $wl
12+
- awesome_bot README.ko.md --allow-dupe --allow-redirect --white-list $wl
13+
- awesome_bot README.ja.md --allow-dupe --allow-redirect --white-list $wl
14+
- awesome_bot README.zh-cn.md --allow-dupe --allow-redirect --white-list $wl
15+
- awesome_bot README.zh-tw.md --allow-dupe --allow-redirect --white-list $wl

README.md

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ A collection of cool hidden and not so hidden features of Git and GitHub. This c
5454
- [GitHub Student Developer Pack](#github-student-developer-pack)
5555
- [GitHub Resources](#github-resources)
5656
- [GitHub Talks](#github-talks)
57+
- [SSH keys](#ssh-keys)
5758
- [Git](#git)
5859
- [Remove All Deleted Files from the Working Tree](#remove-all-deleted-files-from-the-working-tree)
5960
- [Previous Branch](#previous-branch)
6061
- [Stripspace](#stripspace)
61-
- [SSH keys](#ssh-keys)
6262
- [Checking out Pull Requests](#checking-out-pull-requests)
6363
- [Empty Commits](#empty-commits)
6464
- [Styled Git Status](#styled-git-status)
@@ -116,7 +116,7 @@ $ git clone https://github.com/tiimgreen/github-cheat-sheet
116116

117117
[*Read more about the Git `clone` command.*](http://git-scm.com/docs/git-clone)
118118

119-
###Branch
119+
### Branch
120120
#### Compare all Branches to Another Branch
121121

122122
If you go to the repo's [Branches](https://github.com/tiimgreen/github-cheat-sheet/branches) page, next to the Commits button:
@@ -511,7 +511,7 @@ GitHub supports rendering PDF:
511511

512512
[*Read more about rendering PDF.*](https://github.com/blog/1974-pdf-viewing)
513513

514-
###Revert a Pull Request
514+
### Revert a Pull Request
515515
After a pull request is merged, you may find it does not help anything or it was a bad decision to merge the pull request.
516516

517517
You can revert it by clicking the **Revert** button on the right side of a commit in the pull request page to create a pull request with reverted changes to this specific pull request.
@@ -656,6 +656,18 @@ If you are a student you will be eligible for the GitHub Student Developer Pack.
656656
| Git and GitHub Secrets | https://www.youtube.com/watch?v=Foz9yvMkvlA |
657657
| More Git and GitHub Secrets | https://www.youtube.com/watch?v=p50xsL-iVgU |
658658

659+
### SSH keys
660+
661+
You can get a list of public ssh keys in plain text format by visiting:
662+
663+
```
664+
https://github.com/{user}.keys
665+
```
666+
667+
e.g. [https://github.com/tiimgreen.keys](https://github.com/tiimgreen.keys)
668+
669+
[*Read more about accessing public ssh keys.*](https://changelog.com/github-exposes-public-ssh-keys-for-its-users/)
670+
659671
## Git
660672
### Remove All Deleted Files from the Working Tree
661673
When you delete a lot of files using `/bin/rm` you can use the following command to remove them from the working tree and from the index, eliminating the need to remove each one individually:
@@ -715,18 +727,6 @@ $ git stripspace < README.md
715727

716728
[*Read more about the Git `stripspace` command.*](http://git-scm.com/docs/git-stripspace)
717729

718-
### SSH keys
719-
720-
You can get a list of public ssh keys in plain text format by visiting:
721-
722-
```
723-
https://github.com/{user}.keys
724-
```
725-
726-
e.g., [https://github.com/tiimgreen.keys](https://github.com/tiimgreen.keys)
727-
728-
[*Read more about accessing public ssh keys.*](https://changelog.com/github-exposes-public-ssh-keys-for-its-users/)
729-
730730
### Checking out Pull Requests
731731

732732
Pull Requests are special branches on the GitHub repository which can be retrieved locally in several ways:
@@ -1025,6 +1025,7 @@ $ git config --global color.ui 1
10251025
| Git Visualization Playground | http://onlywei.github.io/explain-git-with-d3/#freeplay |
10261026
| Learn Git Branching | http://pcottle.github.io/learnGitBranching/ |
10271027
| A collection of useful .gitignore templates | https://github.com/github/gitignore |
1028+
| Unixorn's git-extra-commands collection of git scripts | https://github.com/unixorn/git-extra-commands |
10281029

10291030
#### Git Books
10301031
| Title | Link |

0 commit comments

Comments
 (0)
0