Skip to content
This repository was archived by the owner on Nov 17, 2018. It is now read-only.

Commit 2b4d2df

Browse files
committed
Switch to backtick code blocks b/c pygments is broke
Hopefully this gets fixed with imathis/octopress#1590
1 parent 1fcf644 commit 2b4d2df

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

source/_posts/2011-06-09-git-pull-with-automatic-rebase.markdown

+6-6
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@ and rebase your commits on top of the new commits from the remote. This is the
4141
You can tell git to use rebase, rather than merge, in one of two ways, depending on
4242
your situation.
4343

44-
{% codeblock Force all new branches to automatically use rebase lang:bash %}
45-
$ git config branch.autosetuprebase always
46-
{% endcodeblock %}
44+
```
45+
$ git config branch.autosetuprebase always # Force all new branches to automatically use rebase
46+
```
4747

4848
You can add the `--global` switch to have all future branches, in all
4949
repositories on this machine, behave this way.
5050

51-
{% codeblock Force existing branches to use rebase. lang:bash %}
52-
$ git config branch.*branch-name*.rebase true
53-
{% endcodeblock %}
51+
```
52+
$ git config branch.*branch-name*.rebase true # Force existing branches to use rebase.
53+
```
5454

5555
<h3>Get more info</h3>
5656

0 commit comments

Comments
 (0)