Skip to content

Commit 3e8d50f

Browse files
committed
Set version to 0.6.0
1 parent 1b569c4 commit 3e8d50f

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

CHANGES.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
Changelog
22
=========
33

4+
0.6.0 (2018-11-19)
5+
------------------
6+
### Changed
7+
- Explain that it is okay to have a merge commit for pull requests.
8+
9+
### Fixed
10+
- Describe `git pull` instead of `git merge` in the "Keep Your Fork
11+
Updated" section.
12+
13+
414
0.5.0 (2018-10-17)
515
------------------
616
### Changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ Fork and Pull Request Workflow
99
[SHIELD_PDF]: https://img.shields.io/badge/download-PDF-brightgreen.svg
1010
[SHIELD_TXT]: https://img.shields.io/badge/download-TXT-brightgreen.svg
1111
[SHIELD_CCBY]: https://img.shields.io/badge/license-CC%20BY%204.0-blue.svg
12-
[DOWNLOAD_PDF]: https://github.com/susam/gitpr/releases/download/0.5.0/gitpr.pdf
13-
[DOWNLOAD_TXT]: https://github.com/susam/gitpr/releases/download/0.5.0/gitpr.txt
12+
[DOWNLOAD_PDF]: https://github.com/susam/gitpr/releases/download/0.6.0/gitpr.pdf
13+
[DOWNLOAD_TXT]: https://github.com/susam/gitpr/releases/download/0.6.0/gitpr.txt
1414
<!-- :: \fi -->
15-
<!-- Version 0.5.0 (2018-11-19) -->
15+
<!-- Version 0.6.0 (2018-11-19) -->
1616
<!-- :: \maketitle -->
1717

1818
This document describes how developers may contribute pull requests to
1919
an upstream repository and how upstream owners may merge pull requests
2020
from contributors according to the very popular fork and pull request
2121
workflow followed in many projects on GitHub.
2222

23-
The download buttons above download version 0.5.0 <!-- x -->
23+
The download buttons above download version 0.6.0 <!-- x -->
2424
(the latest stable release) of this document. <!-- x -->
2525
<!-- x -->
2626
The most recent version of this document is available at

0 commit comments

Comments
 (0)