diff options
author | Johannes Ranke <jranke@uni-bremen.de> | 2014-05-08 21:37:51 +0200 |
---|---|---|
committer | Johannes Ranke <jranke@uni-bremen.de> | 2014-05-08 21:37:51 +0200 |
commit | 74f43ad7dcdff91f406bfa1e68e084ed85000035 (patch) | |
tree | 76a3daff132688c1370af7159639c1d43169a330 /GNUmakefile | |
parent | 89df28000c4ce8c1e46965ad72b79b406e4d512f (diff) |
Improve the process of syncing the r-forge branch
Diffstat (limited to 'GNUmakefile')
-rw-r--r-- | GNUmakefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/GNUmakefile b/GNUmakefile index ac4bd808..24760906 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -86,7 +86,7 @@ release: @echo "\nTo update the svn repository tied to the local r-forge branch with" @echo "changes in the local master branch, run:" @echo "'git checkout r-forge'" - @echo "'git merge --squash master'" + @echo "'git merge --squash -srecursive -Xtheirs --no-commit master'" @echo "'git commit'" @echo "'git svn dcommit'" @echo "\nThen change back to the master branch:" |