On Fri, Jan 15, 2016 at 4:03 PM, Ben Fritz <[email protected]> wrote:
> Ah, but we don't WANT a merge. The customized changeset is simply acting > as a stash that we don't need to manually push/pop from. Thus I suggested > rebasing, and Matteo improved with using "git pull --rebase" instead of a > second manual rebase step. > > After creating the "local only" changeset you could just use that single > pull command to get updates and keep your local changes. > > As long as you never push you're safe. If you sometimes push you'll need > to be careful not to push your "local only" changeset. Now if only git had > a "secret" phase concept like Mercurial... > I thought only Bram is allowed to push to the main repo so there is not much risk of other users polluting it with their local changes. Also, I understood the original question as "what should users do if they want the latest stuff from the git repo and also their local customizations?" Both "git pull" and "git pull --rebase" would accomplish that. The "--rebase" version usually completes without user input, but "git pull" might open an editor to revise commit message for the new merge. This can be avoided by running "git pull --no-edit" which will use the default generated message. I don't know what is the "secret" phase in Mercurial. It is however possible to disable "git push" for some specific branch, for example: git checkout -b local origin/master git config branch.local.pushremote /dev/null Branch "local" is now the active branch, and "git pull" would update it with a new stuff from the master branch on origin. "git push" would however not work, because it is set to use /dev/null as its destination. (You can still push from the "local" branch, but will need to give it an explicit destination.) Pavol -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
