(1) Looking at git-stash.sh I see a few uses of 'git diff' in apply_stash().
Shouldn't these use one of git-diff-{tree,index,files)? The reason is that
porcelain 'git diff' invokes custom diff drivers (that in my case run a UI
program), whereas the plumbing does not.
Is there a particular reason to use porcelain 'git diff'?
(2) when 'git stash apply' runs merge-recursive, it treats the current state
as 'ours' and the stash as 'theirs'. IMHO it should be the other way round:
I have stashed away changes to a binary file. Then committed a different
modification to it, and now want to apply the stash. This results in a
conflict that leaves the current state in the working tree, but I had
preferred that the stashed binary file were in the working tree now.
What do other git-stash users think about changing the order?
-- Hannes
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
