diff options
| author | Jason Blevins <jrblevin@sdf.lonestar.org> | 2008-10-24 18:08:06 -0400 |
|---|---|---|
| committer | Jason Blevins <jrblevin@sdf.lonestar.org> | 2008-10-24 18:10:35 -0400 |
| commit | d1d7a48d5ac8e5e6b87fbf8f47fe4ee3127f2303 (patch) | |
| tree | 8502fca50742ffa9b2f03478766c87a3e9c13df4 | |
| parent | 3044ce0d4a248bac9a3871a9442f4d3e6aa1e5bf (diff) | |
| download | ikiwiki-d1d7a48d5ac8e5e6b87fbf8f47fe4ee3127f2303.tar ikiwiki-d1d7a48d5ac8e5e6b87fbf8f47fe4ee3127f2303.tar.gz | |
response
| -rw-r--r-- | doc/news/git_push_to_this_wiki/discussion.mdwn | 9 |
1 files changed, 9 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 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]] |