Skip to content

Commit

Permalink
Merge pull request stevemao#4 from ReadmeCritic/master
Browse files Browse the repository at this point in the history
Update redirects in Readme
  • Loading branch information
stevemao committed Nov 14, 2015
2 parents 03955ac + 114d81c commit 449b357
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ $ git psykorebase master feature
```


## [gitflow (AVH Edition)](https://github.com/petervanderdoes/gitflow)
## [gitflow (AVH Edition)](https://github.com/petervanderdoes/gitflow-avh)

### flow init

Expand Down Expand Up @@ -598,7 +598,7 @@ $ git fetch mislav,xoebus
### cherry-pick

```
$ git cherry-pick http://github.com/mislav/REPO/commit/SHA
$ git cherry-pick https://github.com/mislav/REPO/commit/SHA
> git remote add -f --no-tags mislav git://github.com/mislav/REPO.git
> git cherry-pick SHA
Expand All @@ -614,7 +614,7 @@ $ git cherry-pick mislav@SHA
### am

```
$ git am https://github.com/defunkt/hub/pull/55
$ git am https://github.com/github/hub/pull/55
[ downloads patch via API ]
> git am /tmp/55.patch
Expand Down Expand Up @@ -650,15 +650,15 @@ $ git pull-request
### checkout

```
$ git checkout https://github.com/defunkt/hub/pull/73
$ git checkout https://github.com/github/hub/pull/73
> git remote add -f --no-tags -t feature mislav git://github.com/mislav/hub.git
> git checkout --track -B mislav-feature mislav/feature
```

### merge

```
$ git merge https://github.com/defunkt/hub/pull/73
$ git merge https://github.com/github/hub/pull/73
> git fetch git://github.com/mislav/hub.git +refs/heads/feature:refs/remotes/mislav/feature
> git merge mislav/feature --no-ff -m 'Merge pull request #73 from mislav/feature...'
```
Expand Down

0 comments on commit 449b357

Please sign in to comment.