From 74f43ad7dcdff91f406bfa1e68e084ed85000035 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Thu, 8 May 2014 21:37:51 +0200 Subject: Improve the process of syncing the r-forge branch --- GNUmakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'GNUmakefile') 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:" -- cgit v1.2.1