Merging without changing the working directory

后端 未结 6 1808
北海茫月
北海茫月 2020-12-03 07:36

I have the following scenario:

* ab82147 (HEAD, topic) changes
* 8993636 changes
* 82f4426 changes
* 18be5a3 (master) first

I\'d like to me

6条回答
  •  Happy的楠姐
    2020-12-03 08:20

    Here's sort of a cheating version.

    1. git stash
    2. git tag tmptag
    3. git merge --no-ff topic
    4. git checkout tmptag (-b tha_brunch)?
    5. git stash pop
    6. git tag -D tmptag

提交回复
热议问题