fb3ef04d20
git-subtree-dir: contrib/unifdef git-subtree-mainline:3b7ffacdeegit-subtree-split:0da4488583
13 lines
190 B
Bash
Executable File
13 lines
190 B
Bash
Executable File
#!/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'
|