From f3d017d26c885a708ec34fbb49dd077dd73eebf8 Mon Sep 17 00:00:00 2001 From: Jason Blevins Date: Fri, 24 Oct 2008 16:16:20 -0400 Subject: Test anon Git push --- doc/news/git_push_to_this_wiki/discussion.mdwn | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 doc/news/git_push_to_this_wiki/discussion.mdwn (limited to '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 new file mode 100644 index 000000000..0bb51fa0c --- /dev/null +++ b/doc/news/git_push_to_this_wiki/discussion.mdwn @@ -0,0 +1,2 @@ +Thanks, Joey! This is awesome...I had to try it out :) +--[[JasonBlevins]] -- cgit v1.2.3 From f20af3bec35b3da52da9084dc539b5ebb8042165 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Fri, 24 Oct 2008 17:41:08 -0400 Subject: Git wizards required to make new anonymous push feature useful for me --- doc/news/git_push_to_this_wiki/discussion.mdwn | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to '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 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]] -- cgit v1.2.3 From bc63bc9eea8274cdb7bdd289a1253bf418dcbfdd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 24 Oct 2008 17:47:55 -0400 Subject: idea --- doc/news/git_push_to_this_wiki/discussion.mdwn | 5 +++++ 1 file changed, 5 insertions(+) (limited to '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 4ca18ce8f..252fe724a 100644 --- a/doc/news/git_push_to_this_wiki/discussion.mdwn +++ b/doc/news/git_push_to_this_wiki/discussion.mdwn @@ -19,3 +19,8 @@ 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]] + +> Not that I'm very careful to avoid pushing merge commits (see git log ;-), +> but I sometimes use `git pull --rebase` to pull changes from a repo. That +> will rebase your local changes on top of the changes pulled, avoiding the +> merge commits. I'm sure more involved solutions are possible. --[[Joey]] -- cgit v1.2.3 From d1d7a48d5ac8e5e6b87fbf8f47fe4ee3127f2303 Mon Sep 17 00:00:00 2001 From: Jason Blevins Date: Fri, 24 Oct 2008 18:08:06 -0400 Subject: response --- doc/news/git_push_to_this_wiki/discussion.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to '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 252fe724a..f948ee6cf 100644 --- a/doc/news/git_push_to_this_wiki/discussion.mdwn +++ b/doc/news/git_push_to_this_wiki/discussion.mdwn @@ -24,3 +24,12 @@ in awful and various ways when it is not the case. Any alternative idea? > but I sometimes use `git pull --rebase` to pull changes from a repo. That > will rebase your local changes on top of the changes pulled, avoiding the > merge commits. I'm sure more involved solutions are possible. --[[Joey]] + +> I decided to use my local `master` branch as a copy of `origin/master` +> (kitenet) and move my local modifications to a separate branch. I'm using +> `master` to edit the wiki but there is still the problem of new upstream +> commits since the last pull. I already had this problem as Joey had pushed +> some changes while I was editing locally. Not knowing about +> `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]] -- cgit v1.2.3 From b44093d6d53ff29855f8c328d5fc88783bc3d45d Mon Sep 17 00:00:00 2001 From: "http://xma.myopenid.com/" Date: Sat, 25 Oct 2008 01:51:53 -0400 Subject: --- doc/news/git_push_to_this_wiki/discussion.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to '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 f948ee6cf..33230c7ef 100644 --- 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]] + +Awesome ! --[[xma]] -- cgit v1.2.3