Git-svn

From Git SCM Wiki
(Difference between revisions)
Jump to: navigation, search
Line 3: Line 3:
 
__TOC__
 
__TOC__
  
 +
== Checkout, log ==
 +
git svn clone -r 400:HEAD https://svn.whatebber.org/repo/trunk folder # choose a recent commit
 +
git log -5
 +
 +
== Commit ==
 +
=== Commit to local Git ===
 +
Git automatically tracks contents and therefor automatically detects renames.
 +
git add --all
 +
git commit -m "whatebber"
 +
 +
=== Commit to remote SVN ===
 +
To see what is going to be committed one can choose the following options.
 +
gitk git-svn..
 +
gitk
 +
git log remotes/git-svn.. --oneline
 +
git svn dcommit --dry-run
 +
 +
To really commit
 +
git svn dcommit
  
 
== Undo Changes ==
 
== Undo Changes ==

Revision as of 11:21, 18 December 2012

This tutorial collects information for users of git as svn client, using git-svn. Please consider reading GitSvnCrashCourse, and the git-svn cheat sheet.

Contents


Checkout, log

git svn clone -r 400:HEAD https://svn.whatebber.org/repo/trunk folder # choose a recent commit
git log -5

Commit

Commit to local Git

Git automatically tracks contents and therefor automatically detects renames.

git add --all
git commit -m "whatebber"

Commit to remote SVN

To see what is going to be committed one can choose the following options.

gitk git-svn..
gitk
git log remotes/git-svn.. --oneline
git svn dcommit --dry-run

To really commit

git svn dcommit

Undo Changes

Undo, backout, or revert changes is done with standard git commands.

Things already committed to svn can be reverted:

git revert hash
git svn dcommit

Things in the working copy can be reset (reverted) to what is checked in:

git reset --hard


Some links

Personal tools