Re: Behavior of stash apply vs merge

2013-01-27 Thread Robin Rosenberg
- Ursprungligt meddelande - > Robin Rosenberg writes: > > > Thanks. Feeling a bit studid now. > > > > I was actually thinking about using merge to implement stash apply > > in JGit. What we have is broken so I tried using merge to implement > > it and them compared to git merge --no-com

Re: Behavior of stash apply vs merge

2013-01-27 Thread Junio C Hamano
Robin Rosenberg writes: > Thanks. Feeling a bit studid now. > > I was actually thinking about using merge to implement stash apply > in JGit. What we have is broken so I tried using merge to implement > it and them compared to git merge --no-commit.. FAIL. Do you have "cherry-pick"? In short, "

Re: Behavior of stash apply vs merge

2013-01-27 Thread Robin Rosenberg
Thanks. Feeling a bit studid now. I was actually thinking about using merge to implement stash apply in JGit. What we have is broken so I tried using merge to implement it and them compared to git merge --no-commit.. FAIL. The main difference is of course that I set the merge base to stash^1, whi

Re: Behavior of stash apply vs merge

2013-01-27 Thread Junio C Hamano
Robin Rosenberg writes: > What good reason is it that 'git stash apply' gives hairy conflict > markers, while 'git merge stash' does not. No renames involved. "git merge stash" is nonsensical and would do a vastly different thing compared to "git stash apply" depending on where you created the s

Behavior of stash apply vs merge

2013-01-27 Thread Robin Rosenberg
Hi, What good reason is it that 'git stash apply' gives hairy conflict markers, while 'git merge stash' does not. No renames involved. -- robin -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://v