Skip to content

Commit

Permalink
Merge pull request tj#1 from tj/master
Browse files Browse the repository at this point in the history
Update with the upstream
  • Loading branch information
Lee-W committed Feb 16, 2016
2 parents 3603b67 + ac0b5fe commit 56a2e27
Show file tree
Hide file tree
Showing 148 changed files with 1,822 additions and 534 deletions.
157 changes: 136 additions & 21 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,146 @@ various contributors:

Development Lead
````````````````

- TJ Holowaychuk <[email protected]>

Maintainer
````````````````
Maintainers
```````````
- Hemanth.HM <[email protected]>
- Nimit Kalra <[email protected]>

Patches and Suggestions
```````````````````````

- Mark Eissler
- Chern Jie
- Kenneth Reitz
- Aggelos Orfanakos
- Jonathan "Duke" Leto
- Domenico Rotiroti
- Jason Young
- Nick Campbell
- Jonhnny Weslley
- Alex McHale
- Gert Van Gool
- Devin Withers
- David Baumgold
- Leila Muhtasib
- Nicolai Skogheim <[email protected]>
- Jonhnny Weslley <[email protected]>
- spacewander <[email protected]>
- LeeW <[email protected]>
- nickl- <[email protected]>
- CJ <[email protected]>
- timfeirg <[email protected]>
- Mark Eissler <[email protected]>
- Leila Muhtasib <[email protected]>
- Jesús Espino <[email protected]>
- Jan Schulz <[email protected]>
- David Baumgold <[email protected]>
- Andrew Janke <[email protected]>
- Kenneth Reitz <[email protected]>
- Sasha Khamkov <[email protected]>
- Damian Krzeminski <[email protected]>
- Aggelos Orfanakos <[email protected]>
- grindhold <[email protected]>
- Camille Reynders <[email protected]>
- NANRI <[email protected]>
- Chris Hall <[email protected]>
- Phally <[email protected]>
- Rémy HUBSCHER <[email protected]>
- Rico Sta. Cruz <[email protected]>
- Alexander Krasnukhin <[email protected]>
- Takuma Yamaguchi <[email protected]>
- gisphm <[email protected]>
- wooorm <[email protected]>
- Philipp Klose <[email protected]>
- Jonathan "Duke" Leto <[email protected]>
- Nils Winkler <[email protected]>
- Ivan Malopinsky <[email protected]>
- Julio Napurí <[email protected]>
- Hogan Long <[email protected]>
- Brian J Brennan <[email protected]>
- Gert Van Gool <[email protected]>
- Curtis McEnroe <[email protected]>
- Nate Jones <[email protected]>
- Newell Zhu <[email protected]>
- Patryk Małek <[email protected]>
- Paul Schreiber <[email protected]>
- Andre Cerqueira <[email protected]>
- Richard Littauer <[email protected]>
- Jean Jordaan <[email protected]>
- Alexis GRIMALDI <[email protected]>
- David Rogers <[email protected]>
- Devin Withers <[email protected]>
- Tom Vincent <[email protected]>
- Domenico Rotiroti <[email protected]>
- Wil Moore III <[email protected]>
- Justin Guenther <[email protected]>
- go2null <[email protected]>
- Evan Grim <[email protected]>
- Kylie McClain <[email protected]>
- luozexuan <[email protected]>
- Florian H <[email protected]>
- Guillaume Seren <[email protected]>
- phigoro <[email protected]>
- soffolk <[email protected]>
- Marc Harter <[email protected]>
- Xiaopei Li <[email protected]>
- creynders <[email protected]>
- dead-horse <[email protected]>
- eszabpt <[email protected]>
- jykntr <[email protected]>
- meza <[email protected]>
- neydroid <[email protected]>
- nulltask <[email protected]>
- zeroDivisible <[email protected]>
- Adam Parkin <[email protected]>
- ☃ pitr <[email protected]>
- Akim Demaille <[email protected]>
- Alex McHale <[email protected]>
- Allan Odgaard <[email protected]>
- Amir Tocker <[email protected]>
- Andrei Petcu <[email protected]>
- Andrew Starr-Bochicchio <[email protected]>
- Andy <[email protected]>
- Antoine Beaupré <[email protected]>
- Aurélien Scoubeau <[email protected]>
- Balazs Nadasdi <[email protected]>
- Ben Parnell <[email protected]>
- Brandon Zylstra <[email protected]>
- Bruno Sutic <[email protected]>
- Carl Casbolt <[email protected]>
- Ciro Nunes <[email protected]>
- Craig MacGregor <[email protected]>
- Dan Jackson <[email protected]>
- Daniel Schildt <[email protected]>
- Dave James Miller <[email protected]>
- David Hartmann <[email protected]>
- Dung Quang <[email protected]>
- Emil Kjelsrud <[email protected]>
- Greg Allen <[email protected]>
- Guillermo Rauch <[email protected]>
- Gunnlaugur Thor Briem <[email protected]>
- James Manning <[email protected]>
- Jan Krueger <[email protected]>
- Jarod Stewart <[email protected]>
- Jason Young <[email protected]>
- Jens K. Mueller <[email protected]>
- Jesse Sipprell <[email protected]>
- Jianjin Fan <[email protected]>
- Johannes Ewald <[email protected]>
- John Hoffmann <[email protected]>
- Jon Ander Peñalba <[email protected]>
- Joshua Appelman <[email protected]>
- Kevin Woo <[email protected]>
- Konstantin Schukraft <[email protected]>
- Leandro López <[email protected]>
- Maarten Winter <[email protected]>
- Mathieu D. (MatToufoutu) <[email protected]>
- Matt Colyer <[email protected]>
- Matthew Avant <[email protected]>
- Michael Komitee <[email protected]>
- Michael Matuzak <[email protected]>
- Moritz Grauel <[email protected]>
- Nathan Rajlich <[email protected]>
- Nick Campbell <[email protected]>
- Nick Payne <[email protected]>
- Niklas Fiekas <[email protected]>
- Raphael Fleischlin <[email protected]>
- Rasmus Wriedt Larsen <[email protected]>
- Riceball LEE <[email protected]>
- Rob Kennedy <[email protected]>
- Ryan Bohn <[email protected]>
- Sam Thursfield <[email protected]>
- Stephen Mathieson <[email protected]>
- Steve Mao <[email protected]>
- Todd Wolfson <[email protected]>
- Tony <[email protected]>
- TweeKane <[email protected]>
- Valérian Galliat <[email protected]>
- Duane Johnson
- Todd Wolfson
- Niklas Fiekas
- Paul Schreiber
86 changes: 58 additions & 28 deletions Commands.md
Original file line number Diff line number Diff line change
@@ -1,50 +1,52 @@

- [`git extras`](#git-extras)
- [`git squash`](#git-squash)
- [`git summary`](#git-summary)
- [`git line-summary`](#git-line-summary)
- [`git effort`](#git-effort)
- [`git alias`](#git-alias)
- [`git archive-file`](#git-archive-file)
- [`git authors`](#git-authors)
- [`git changelog`](#git-changelog)
- [`git clear`](#git-clear)
- [`git commits-since`](#git-commits-since)
- [`git contrib`](#git-contrib)
- [`git count`](#git-count)
- [`git create-branch`](#git-create-branch)
- [`git delete-branch`](#git-delete-branch)
- [`git delete-merged-branches`](#git-delete-merged-branches)
- [`git delete-submodule`](#git-delete-submodule)
- [`git delete-tag`](#git-delete-tag)
- [`git delete-merged-branches`](#git-delete-merged-branches)
- [`git delta`](#git-delta)
- [`git effort`](#git-effort)
- [`git extras`](#git-extras)
- [`git feature|refactor|bug|chore`](#git-featurerefactorbugchore)
- [`git fork`](#git-fork)
- [`git fresh-branch`](#git-fresh-branch)
- [`git guilt`](#git-guilt)
- [`git merge-into`](#git-merge-into)
- [`git gh-pages`](#git-gh-pages)
- [`git graft`](#git-graft)
- [`git alias`](#git-alias)
- [`git guilt`](#git-guilt)
- [`git ignore`](#git-ignore)
- [`git ignore-io`](#git-ignore-io)
- [`git info`](#git-info)
- [`git fork`](#git-fork)
- [`git line-summary`](#git-line-summary)
- [`git local-commits`](#git-local-commits)
- [`git lock`](#git-lock)
- [`git locked`](#git-locked)
- [`git merge-into`](#git-merge-into)
- [`git merge-repo`](#git-merge-repo)
- [`git missing`](#git-missing)
- [`git obliterate`](#git-obliterate)
- [`git pr`](#git-pr)
- [`git psykorebase`](#git-psykorebase)
- [`git release`](#git-release)
- [`git contrib`](#git-contrib)
- [`git repl`](#git-repl)
- [`git undo`](#git-undo)
- [`git gh-pages`](#git-gh-pages)
- [`git reset-file`](#git-reset-file)
- [`git root`](#git-root)
- [`git scp`](#git-scp)
- [`git sed`](#git-sed)
- [`git setup`](#git-setup)
- [`git squash`](#git-squash)
- [`git summary`](#git-summary)
- [`git sync`](#git-sync)
- [`git touch`](#git-touch)
- [`git obliterate`](#git-obliterate)
- [`git feature|refactor|bug|chore`](#git-featurerefactorbugchore)
- [`git local-commits`](#git-local-commits)
- [`git archive-file`](#git-archive-file)
- [`git missing`](#git-missing)
- [`git lock`](#git-lock)
- [`git locked`](#git-locked)
- [`git undo`](#git-undo)
- [`git unlock`](#git-unlock)
- [`git reset-file`](#git-reset-file)
- [`git pr`](#git-pr)
- [`git root`](#git-root)
- [`git delta`](#git-delta)
- [`git merge-repo`](#git-merge-repo)
- [`git psykorebase`](#git-psykorebase)

## git extras

Expand Down Expand Up @@ -73,7 +75,7 @@ Sets up the `gh-pages` branch. (See [GitHub Pages](http://pages.github.com/) do

## git feature|refactor|bug|chore

Create the given feature, refactor, bug or chore branch `name`:
Create/Merge the given feature, refactor, bug or chore branch `name`:

```bash
$ git feature dependencies
Expand Down Expand Up @@ -749,6 +751,10 @@ Remove the latest 3 commits:
git undo 3
```
## git sed
Run grep as directed but replace the given files with the pattern.
## git setup
Set up a git repository (if one doesn't exist), add all files, and make an initial commit. `dir` defaults to the current working directory.
Expand Down Expand Up @@ -895,6 +901,15 @@ From https://github.com/tj/git-extras
Switched to branch 'pr/226'
```

You can also checkout a pull request based on a GitHub url

```bash
$ git pr https://github.com/tj/git-extras/pull/453
From https://github.com/tj/git-extras
* [new ref] refs/pull/453/head -> pr/453
Switched to branch 'pr/453'
```

To remove all local pull request branches, provide the magic `clean` parameter:

```bash
Expand Down Expand Up @@ -931,7 +946,7 @@ Makefile
README.md
```

## git-clear
## git clear

Does a hard reset and deletes all untracked files from the working directory

Expand Down Expand Up @@ -973,3 +988,18 @@ $ git psykorebase master feature
```

The above rebase `feature` branch on top of `master` branch

## git sync

Sync local branch with its remote branch

```bash
$ git sync
```

Sync local branch with origin/master

```bash
$ git sync origin master
```

Loading

0 comments on commit 56a2e27

Please sign in to comment.