[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/s
From: |
Robert Pluim |
Subject: |
Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs |
Date: |
Mon, 17 Aug 2020 17:37:33 +0200 |
>>>>> On Mon, 17 Aug 2020 10:57:11 -0400, Stefan Monnier
>>>>> <monnier@iro.umontreal.ca> said:
>> You forgot to add '--rebase' to your 'git pull'.
Stefan> Doesn't Git offer some way to *merge* (not rebase) but with the
branches swapped?
Stefan> [ As if you merged HEAD into dest rather than the reverse ]
Probably, but I donʼt know how. I just set up git to auto-rebase, and
spare my limited brain cycles for other stuff :-)
Robert
- Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs, Lars Ingebrigtsen, 2020/08/16
- Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs, Eli Zaretskii, 2020/08/16
- Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs, Robert Pluim, 2020/08/17
- Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs, Stefan Monnier, 2020/08/17
- Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs, Andreas Schwab, 2020/08/17
- Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs, Stefan Monnier, 2020/08/17
- Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs, Andreas Schwab, 2020/08/17
- Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs, Stefan Monnier, 2020/08/17
- Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs, Yuri Khan, 2020/08/18
- Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs, Stefan Monnier, 2020/08/18
- Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs, Yuri Khan, 2020/08/18
- Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs, Madhu, 2020/08/19
- Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs, Stefan Monnier, 2020/08/19