[GNUnet-SVN] r35540 - gnunet-qt

[gnunet]

Author: lynx
Date: 2015-04-19 16:15:29 +0200 (Sun, 19 Apr 2015)
New Revision: 35540

Added:
   gnunet-qt/Makefile
Log:
git-svn helper Makefile

Added: gnunet-qt/Makefile
===================================================================
--- gnunet-qt/Makefile                          (rev 0)
+++ gnunet-qt/Makefile  2015-04-19 14:15:29 UTC (rev 35540)
@@ -0,0 +1,36 @@
+# torify if you want to torify
+
+# fetch stuff from the svn server
+fetch:
+       git svn fetch
+
+# view them diffs
+diff:
+       git diff HEAD git-svn | vim -R "+set syntax=diff" -
+
+# pull and merge
+pull:
+       git svn rebase
+
+# Failed to merge in the changes?
+# When you have resolved this problem run "git rebase --continue".
+continue:
+       git rebase --continue
+
+# Should you prefer to skip this patch, instead run "git rebase --skip".
+skip:
+       git rebase --skip
+
+# To check out the original branch and stop rebasing run "git rebase --abort".
+abort:
+       git rebase --abort
+
+# to start using git with svn
+init:
+       git svn init https://gnunet.org/svn/gnunet-qt
+
+# typical way to submit stuff to the svn server
+push:
+       -git commit -a
+       git svn rebase
+       git svn dcommit