|
| From: | Andreas Schwab |
| Subject: | Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs |
| Date: | Mon, 17 Aug 2020 22:05:32 +0200 |
| User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) |
On Aug 17 2020, Stefan Monnier wrote: >>> Doesn't Git offer some way to *merge* (not rebase) but with the branches >>> swapped? >> A merge always uses HEAD as the first parent, so if you want to swap, >> swap HEAD. > > How can I do that in a way that as seamless as `git merge`? You just need to make sure HEAD points to the commit you want as the first parent. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 "And now for something completely different."
| [Prev in Thread] | Current Thread | [Next in Thread] |