File tree Expand file tree Collapse file tree 2 files changed +14
-4
lines changed Expand file tree Collapse file tree 2 files changed +14
-4
lines changed Original file line number Diff line number Diff line change 1
1
Changelog
2
2
=========
3
3
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
+
4
14
0.5.0 (2018-10-17)
5
15
------------------
6
16
### Changed
Original file line number Diff line number Diff line change @@ -9,18 +9,18 @@ Fork and Pull Request Workflow
9
9
[ SHIELD_PDF ] : https://img.shields.io/badge/download-PDF-brightgreen.svg
10
10
[ SHIELD_TXT ] : https://img.shields.io/badge/download-TXT-brightgreen.svg
11
11
[ 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
14
14
<!-- :: \fi -->
15
- <!-- Version 0.5 .0 (2018-11-19) -->
15
+ <!-- Version 0.6 .0 (2018-11-19) -->
16
16
<!-- :: \maketitle -->
17
17
18
18
This document describes how developers may contribute pull requests to
19
19
an upstream repository and how upstream owners may merge pull requests
20
20
from contributors according to the very popular fork and pull request
21
21
workflow followed in many projects on GitHub.
22
22
23
- The download buttons above download version 0.5 .0 <!-- x -->
23
+ The download buttons above download version 0.6 .0 <!-- x -->
24
24
(the latest stable release) of this document. <!-- x -->
25
25
<!-- x -->
26
26
The most recent version of this document is available at
You can’t perform that action at this time.
0 commit comments