[proaudio] [2989] git : add .gitignore and git-README.md (for git-svn developers) |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2989
Author: palo
Date: 2016-01-19 18:08:11 +0100 (Tue, 19 Jan 2016)
Log Message:
-----------
git : add .gitignore and git-README.md (for git-svn developers)
Added Paths:
-----------
trunk/.gitignore
trunk/git-README.md
Added: trunk/.gitignore
===================================================================
--- trunk/.gitignore (rev 0)
+++ trunk/.gitignore 2016-01-19 17:08:11 UTC (rev 2989)
@@ -0,0 +1 @@
+.idea
Added: trunk/git-README.md
===================================================================
--- trunk/git-README.md (rev 0)
+++ trunk/git-README.md 2016-01-19 17:08:11 UTC (rev 2989)
@@ -0,0 +1,15 @@
+# README for git-svn users
+
+Here are some notes for developers who use git-svn to commit
+
+# pull
+
+> git checkout master
+> git svn rebase
+
+# commit to svn upstream
+
+> git checkout master ; git svn rebase # keep in sync with upstream
+> git merge --squash --no-commit my-development-branch # merge your changes
+> git commit -a # write commit message
+> git svn dcommit # push your changes to upstream