Skip to content

Commit ad7959c

Browse files
authored
Merge pull request #45 from vsemozhetbyt/patch-1
Fix formatting nit
2 parents b6f16e8 + af70eb0 commit ad7959c

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

README.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,10 @@ holds true that you should apply all of the above *before* pushing it.
157157
followed by a single space, with blank lines in
158158
between
159159
160-
The pointers to your related resources can serve as a footer
161-
for your commit message. Here is an example that is referencing
160+
The pointers to your related resources can serve as a footer
161+
for your commit message. Here is an example that is referencing
162162
issues in a bug tracker:
163-
163+
164164
Resolves: #56, #78
165165
See also: #12, #34
166166
@@ -212,18 +212,18 @@ holds true that you should apply all of the above *before* pushing it.
212212

213213
2. Rebase it onto the branch it's going to be merged to:
214214

215-
```shell
216-
[my-branch] $ git fetch
217-
[my-branch] $ git rebase origin/master
218-
# then merge
219-
```
215+
```shell
216+
[my-branch] $ git fetch
217+
[my-branch] $ git rebase origin/master
218+
# then merge
219+
```
220220

221-
This results in a branch that can be applied directly to the end of the
222-
"master" branch and results in a very simple history.
221+
This results in a branch that can be applied directly to the end of the
222+
"master" branch and results in a very simple history.
223223

224-
*(Note: This strategy is better suited for projects with short-running
225-
branches. Otherwise it might be better to occassionally merge the
226-
"master" branch instead of rebasing onto it.)*
224+
*(Note: This strategy is better suited for projects with short-running
225+
branches. Otherwise it might be better to occassionally merge the
226+
"master" branch instead of rebasing onto it.)*
227227

228228
* If your branch includes more than one commit, do not merge with a
229229
fast-forward:

0 commit comments

Comments
 (0)