aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-04-30 16:31:36 -0400
committerJoey Hess <joey@kitenet.net>2011-04-30 16:31:36 -0400
commit5885551e82f3c1927590a82ac5fb53e114ecc863 (patch)
treec445e6a8bfcc0180d308f6b38a3bf48fec9f3fca
parentbad5072c02d506b5b5a0d74cd60639f7f62cc7d3 (diff)
parente7d54e3f9156fb856d39131ad8e41f619a536204 (diff)
downloadikiwiki-5885551e82f3c1927590a82ac5fb53e114ecc863.tar
ikiwiki-5885551e82f3c1927590a82ac5fb53e114ecc863.tar.gz
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
-rw-r--r--doc/todo/headless_git_branches.mdwn3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/todo/headless_git_branches.mdwn b/doc/todo/headless_git_branches.mdwn
index 8a1e68201..e97b59900 100644
--- a/doc/todo/headless_git_branches.mdwn
+++ b/doc/todo/headless_git_branches.mdwn
@@ -11,6 +11,9 @@ I've fixed this initial construction case, and, based on my testing, I've also f
Please commit so my users stop whining at me about having clean branches to push to, the big babies.
Summary: Change three scary loud failure cases related to empty branches into three scary loud success cases.
+
+[[!tag patch]]
+
<pre>
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index cf7fbe9..5b1e334 100644