diff --git a/helpers/llvm-reset b/helpers/llvm-reset
new file mode 100755
index 0000000..f219cd8
--- /dev/null
+++ b/helpers/llvm-reset
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+# Helper script for fixing Git-Svn problems.
+
+. llvm-common
+
+reset_git_svn() {
+  name=$1
+  dir=$2
+  if [[ -d $dir && -d $dir/.git/svn ]]; then
+    echo " + Resetting $name"
+    cd $dir
+    rm -rf .git/svn
+    safe_run git svn rebase -l
+  fi
+}
+
+reset_git_svn LLVM $LLVM_SRC
+reset_git_svn Clang $LLVM_SRC/../clang
+reset_git_svn Compiler-RT $LLVM_SRC/../compiler-rt
+reset_git_svn Libc++ $LLVM_SRC/../libcxx
+reset_git_svn Libc++abi $LLVM_SRC/../libcxxabi
+reset_git_svn LibUnwind $LLVM_SRC/../libunwind
+reset_git_svn Linker $LLVM_SRC/../lld
+reset_git_svn Debugger $LLVM_SRC/../lldb
+reset_git_svn LNT $LLVM_SRC/../lnt
+reset_git_svn Zorg $LLVM_SRC/../zorg
+reset_git_svn Test-Suite $LLVM_SRC/../test-suite