contrib/unifdef/scripts/svnup.sh


1
2
3
4
5
6
7
8
9
10
11
12

#!/bin/sh -e

git svn fetch -A scripts/authors.svn

git checkout FreeBSD

case "$(git merge --no-commit git-svn)" in
"Already up-to-date.")
	exit 0
esac

git commit -m 'Merge back from svn'