anildigital (owner)

Revisions

gist: 155455 Download_button fork
public
Public Clone URL: git://gist.github.com/155455.git
Embed All Files: show embed
Git SVN workflow.sh #
raw 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27

# >> First workflow
git svn clone <svn_repo>
 
git checkout -b featureZ
# hack hack hack
 
git commit -a
git svn rebase
 
git svn dcommit   # you can add -e to enter new 
                  # commit message for SVN
 
# ---------------------------
 
# >> Second workflow (more ideal)
git svn clone <svn_repo>
 
git checkout -b featureZ
# hack hack hack
 
git commit -a
git checkout master
git merge featureZ # alternatively you an do git merge --squash featureZ
                   # to make all commits made into a single SVN commit 
 
git svn dcommit    # you can add -e to enter new 
                   # commit message for SVN