Git-svn

From Git SCM Wiki
(Difference between revisions)
Jump to: navigation, search
(checkout / clone, log)
Line 8: Line 8:
  
 
Create a .gitignore file on the toplevel to replicate svn's ignore properties.
 
Create a .gitignore file on the toplevel to replicate svn's ignore properties.
  echo "tmp" > .gitignore
+
  echo "folder/or/file/to/ignore" > .gitignore
  
 
== commit ==
 
== commit ==

Revision as of 11:59, 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 cheatsheet. As Git is distributed, there is no serial version numbering, but hashes for commits (aka change sets) are used.

Contents


checkout / clone, log

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

Create a .gitignore file on the toplevel to replicate svn's ignore properties.

echo "folder/or/file/to/ignore" > .gitignore

commit

commit to local Git

Git automatically tracks contents and therefor automatically detects all changes done with file browsers, programming tools etc.

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, revert) changes and commits 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