aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorintrigeri <intrigeri@web>2008-10-24 17:41:08 -0400
committerJoey Hess <joey@kitenet.net>2008-10-24 17:41:08 -0400
commitf20af3bec35b3da52da9084dc539b5ebb8042165 (patch)
tree5492cdfc6a051a4812c2b47925efaf5b06a7bc36 /doc
parent52856b307b6451076f82aa7f8f3d70f5ca162dda (diff)
downloadikiwiki-f20af3bec35b3da52da9084dc539b5ebb8042165.tar
ikiwiki-f20af3bec35b3da52da9084dc539b5ebb8042165.tar.gz
Git wizards required to make new anonymous push feature useful for me
Diffstat (limited to 'doc')
-rw-r--r--doc/news/git_push_to_this_wiki/discussion.mdwn19
1 files changed, 19 insertions, 0 deletions
diff --git a/doc/news/git_push_to_this_wiki/discussion.mdwn b/doc/news/git_push_to_this_wiki/discussion.mdwn
index 0bb51fa0c..4ca18ce8f 100644
--- a/doc/news/git_push_to_this_wiki/discussion.mdwn
+++ b/doc/news/git_push_to_this_wiki/discussion.mdwn
@@ -1,2 +1,21 @@
Thanks, Joey! This is awesome...I had to try it out :)
--[[JasonBlevins]]
+
+I am really happy to hear of this new feature, that I was (more or less)
+secretly dreaming of. But - and that's why I'm still insanely editing
+this wiki inside a web browser - I wonder how I'll use it for real: my
+own master branch contains a few dozens merge commits, and one is created
+every time I `git pull` ikiwiki repository (or another clone of it, living
+on one of my other boxes that by chance had Internet access more recently).
+I do not want to clutter Joey's repository with these commits, so I guess
+I have to learn some more of Git everything-is-possible world (a nice thing
+is: I am not limited anymore to "Emacs can do it", and I'm now in a position
+to say "Git can do it" or "ikiwiki already does it", depending on the
+situation). Well, let's focus. Git wizards amongst us (let's use this wiki
+as if it were users@ikiwiki.info, ok?), what would you suggest? I was thinking
+of having a new branch in my cloned repository, dedicated to editing this wiki;
+I could use `rebase` instead of `fetch+merge` to get the new upstream commits
+into this special-purpose branch. I guess it would work nicely if I had only
+one offline box with not-yet-pushed changes at the same time, but would break
+in awful and various ways when it is not the case. Any alternative idea?
+--[[intrigeri]]