urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

idea

master
Joey Hess 2008-10-24 17:47:55 -04:00
parent f20af3bec3
commit bc63bc9eea
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/news/git_push_to_this_wiki/discussion.mdwn
View File

@ -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]]