Re: Bug? Subtree merge seems to choke on trailing slashes.

2012-11-14 Thread Junio C Hamano
Jack O'Connor oconnor...@gmail.com writes: Do I have the right list for bug reports? Apologies if not. Yes. On Tue, Nov 6, 2012 at 5:58 PM, Jack O'Connor oconnor...@gmail.com wrote: 2) I try to merge more upstream changes on top of that with the following command: git merge

Re: Bug? Subtree merge seems to choke on trailing slashes.

2012-11-13 Thread Jack O'Connor
Do I have the right list for bug reports? Apologies if not. On Tue, Nov 6, 2012 at 5:58 PM, Jack O'Connor oconnor...@gmail.com wrote: I'm summarizing from here: http://stackoverflow.com/questions/5904256/git-subtree-merge-into-a-deeply-nested-subdirectory Quick repro: 1) I do an initial