Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / news / git_push_to_this_wiki / discussion.mdwn

diff --git a/doc/news/git_push_to_this_wiki/discussion.mdwn b/doc/news/git_push_to_this_wiki/discussion.mdwn
index f948ee6cf7a67dac45a13489db32db68b02caa83..33230c7ef399563cd6957ad3afa982e163cb6687 100644 (file)
--- a/doc/news/git_push_to_this_wiki/discussion.mdwn
+++ b/doc/news/git_push_to_this_wiki/discussion.mdwn
@@ -33,3 +33,5 @@ in awful and various ways when it is not the case. Any alternative idea?
 > `pull --rebase`, I took the long way out: branch, roll back HEAD, rebase,
 > and merge.  That was too much work...It looks like `pull --rebase` is the
 > way to go. --[[JasonBlevins]]
 > `pull --rebase`, I took the long way out: branch, roll back HEAD, rebase,
 > and merge.  That was too much work...It looks like `pull --rebase` is the
 > way to go. --[[JasonBlevins]]

+
+Awesome ! --[[xma]]