how to specify default merge strategy on git stash pop

git

Solution

This is now possible:

git cherry-pick -n -m1 -Xtheirs stash

The literal string `stash` now represents the top stash entry (you can also do `stash@{1}` for the one below that, and so on.

More details on how this works are on this answer.

Problem

How can I specify default merge strategy when I do a `git stash pop`? I tried ``` git stash pop --theirs ``` but that doesn't work.

Original source

Related problems