diff options
| author | PaulePanter <PaulePanter@web> | 2010-04-14 17:38:39 +0000 |
|---|---|---|
| committer | Joey Hess <joey@finch.kitenet.net> | 2010-04-14 17:38:39 +0000 |
| commit | 53c8e674ace50d8733e913e8cfa5d40793e5019d (patch) | |
| tree | a211031f8c3a02cc9bfe279a3d3cdff95a540a6c | |
| parent | e6e77d2311503627fb9ac8485f323535de059359 (diff) | |
| download | ikiwiki-53c8e674ace50d8733e913e8cfa5d40793e5019d.tar ikiwiki-53c8e674ace50d8733e913e8cfa5d40793e5019d.tar.gz | |
Correct comment. We want to merge the branch *doc* into branch *master* as the sample output suggests.
| -rw-r--r-- | doc/tips/spam_and_softwaresites.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/tips/spam_and_softwaresites.mdwn b/doc/tips/spam_and_softwaresites.mdwn index 507858c0c..a07889e6b 100644 --- a/doc/tips/spam_and_softwaresites.mdwn +++ b/doc/tips/spam_and_softwaresites.mdwn @@ -34,7 +34,7 @@ branch. If there is, see 'erase spam from the commit history', below, first. Once you are confident it's clean: - # ensure you are on the doc branch + # ensure you are on the master branch $ git branch doc * master |