On Tue, Nov 08, 2011 at 03:50:25PM -0500, Matt Arsenault wrote: > There seems to be a bug using git svn rebase with strategies > > git version 1.7.7.2 > > > $ git svn rebase --strategy=theirs ENOENT. The "theirs" strategy doesn't exist (there is an "ours" strategy). "Theirs" in a option to the recursive merge strategy. > > First, rewinding head to replay your work on top of it... > /usr/lib/git-core/git-rebase--merge: line 69: git-merge-theirs: command not found > Unknown exit code (127) from command: git-merge-theirs deabad54a6d5ce3ab3f655e06b9c24eadbba6f6c^ -- HEAD deabad54a6d5ce3ab3f655e06b9c24eadbba6f6c > rebase --strategy=theirs refs/remotes/git-svn: command returned error: 1 The bug is the failure to detect that the merge strategy doesn't exist, but your command wouldn't have worked anyway. cmn -- 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