|
From: | Stefan Monnier |
Subject: | Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs |
Date: | Wed, 19 Aug 2020 09:15:57 -0400 |
User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) |
> to preserve mtimes > > git branch #=> mybranch > git-new-workdir.sh . /dev/shm/emacs > cd /dev/shm/emacs; git checkout master; git pull > git rebase master mybranch > cd - > git checkout -f mybranch # touches only new files. > rm -rf /dev/shm/emacs Right (modulo "rebase" => "merge" and the fact that nowadays I'd use `git worktree` instead of `git-new-workdir`), but this option comes with the other caveat that it requires extra disk space, can take significantly longer (because of the need to create all those files), and requires you to do the conflict resolution in another tree (which can be problematic if you want/need to compile something during the resolution since nothing's compiled there yet so it'll take extra time to `./configure` and compile). IOW it's pretty far from "as seamless as `git merge`". Stefan
[Prev in Thread] | Current Thread | [Next in Thread] |