Changes between Version 19 and Version 20 of GitMirror


Ignore:
Timestamp:
04/12/2013 06:18:11 PM (4 years ago)
Author:
tom.prince
Comment:

Add some notes about commiting.

Legend:

Unmodified
Added
Removed
Modified
  • GitMirror

    v19 v20  
    120120== git svn committing ==
    121121
     122`git commit` only makes local commits. To get commits into svn,
     123{{{
     124git svn dcommit --dry
     125}}}
     126will (update git-svn's metadata cache and) show where git will try to commit, and the list of commits it will push.
     127{{{
     128git svn dcommit
     129}}}
     130will actually push the changes to svn.
     131
    122132No special rules apply about making Git commits, you can make as many commits as you like, then rebase them into a nice patch series as normal (although the Twisted review process generally reviews the diff of an entire branch, not individual commits, since rebasing isn't possible in SVN).
    123133
     
    133143git commit -m'Merging forward'
    134144git svn dcommit
     145}}}
    135146
    136147== git svn branch merging ==