piotr@piotr-laptop:/tmp/d$ git svn clone file:///tmp/b Initialized empty Git repository in /tmp/d/b/.git/ A file.txt r1 = 87028a5d8fec778898be76e99ad791219cf23003 (refs/remotes/git-svn) Checked out HEAD: file:///tmp/b r1 piotr@piotr-laptop:/tmp/d$ cd b piotr@piotr-laptop:/tmp/d/b$ ls file.txt piotr@piotr-laptop:/tmp/d/b$ git svn info Path: . URL: file:///tmp/b Repository Root: file:///tmp/b Repository UUID: 86220547-ff96-4b00-a3f0-fa571945d0ba Revision: 1 Node Kind: directory Schedule: normal Last Changed Author: piotr Last Changed Rev: 1 Last Changed Date: 2011-04-13 20:55:23 +0200 (śro, 13 kwi 2011) piotr@piotr-laptop:/tmp/d/b$ echo two > two.txt piotr@piotr-laptop:/tmp/d/b$ git add two.txt piotr@piotr-laptop:/tmp/d/b$ git commit -m two [master 01e5e0a] two 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 two.txt piotr@piotr-laptop:/tmp/d/b$ echo three > three.txt piotr@piotr-laptop:/tmp/d/b$ git add three.txt piotr@piotr-laptop:/tmp/d/b$ git commit -m three.txt [master d284768] three.txt 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 three.txt piotr@piotr-laptop:/tmp/d/b$ echo next >> three.txt && git add three.txt && git commit -m next [master 0a0c0cc] next 1 files changed, 1 insertions(+), 0 deletions(-) piotr@piotr-laptop:/tmp/d/b$ echo next >> three.txt && git add three.txt && git commit -m next [master 77d91f8] next 1 files changed, 1 insertions(+), 0 deletions(-) piotr@piotr-laptop:/tmp/d/b$ echo next >> three.txt && git add three.txt && git commit -m next [master cea17b0] next 1 files changed, 1 insertions(+), 0 deletions(-) piotr@piotr-laptop:/tmp/d/b$ echo next >> three.txt && git add three.txt && git commit -m next [master ff44044] next 1 files changed, 1 insertions(+), 0 deletions(-) piotr@piotr-laptop:/tmp/d/b$ git log commit ff440444a5b8e380fb44180d86f66bb566907a53 Author: Piotr Krukowiecki <> Date: Wed Apr 13 21:02:21 2011 +0200 next commit cea17b028b195d2988ee5e4dc9da0bd4ffa5c57a Author: Piotr Krukowiecki <> Date: Wed Apr 13 21:02:21 2011 +0200 next commit 77d91f88bf9ae81d747d80bb5c370d16e76737ff Author: Piotr Krukowiecki <> Date: Wed Apr 13 21:02:20 2011 +0200 next commit 0a0c0cc0f6121d81392d8df80440bef429270b16 Author: Piotr Krukowiecki <> Date: Wed Apr 13 21:02:19 2011 +0200 next commit d28476865857a9fff237b29869bf21b3c83d916e Author: Piotr Krukowiecki <> Date: Wed Apr 13 21:01:41 2011 +0200 three.txt commit 01e5e0abb9c133a6ff7ef85bbbdbc2c98229cd68 Author: Piotr Krukowiecki <> Date: Wed Apr 13 21:01:20 2011 +0200 two commit 87028a5d8fec778898be76e99ad791219cf23003 Author: piotr Date: Wed Apr 13 18:55:23 2011 +0000 hi git-svn-id: file:///tmp/b@1 86220547-ff96-4b00-a3f0-fa571945d0ba piotr@piotr-laptop:/tmp/d/b$ git svn rebase M file.txt r2 = 1055c8a9239d7a75856f94a6479192158e1073ec (refs/remotes/git-svn) M file.txt r3 = c9c918a018d21e6af8f4b3d4e22a2aa700024eca (refs/remotes/git-svn) First, rewinding head to replay your work on top of it... Applying: two Applying: three.txt Applying: next Applying: next Applying: next Applying: next piotr@piotr-laptop:/tmp/d/b$ git svn dcommit Committing to file:///tmp/b ... A two.txt Committed r5 M file.txt r4 = 161ef277a311148c42a4391fab1531b818d6b8ba (refs/remotes/git-svn) A two.txt r5 = e2ac55eff258832e0dc7612b9a12913c861897a3 (refs/remotes/git-svn) W: 9a64a0288d5474a78eb528c81efe38a026331fdb and refs/remotes/git-svn differ, using rebase: :100644 100644 b77ce16c276583c177f535cde69e8764ee4a1497 928a139863b65711aa12167b81fefccfacc00d69 M file.txt First, rewinding head to replay your work on top of it... Applying: three.txt Applying: next Applying: next Applying: next Applying: next Sleeping... A three.txt Committed r6 A three.txt r6 = fe11637f550e3158acf333cbd6197fbc775d9000 (refs/remotes/git-svn) No changes between current HEAD and refs/remotes/git-svn Resetting to the latest refs/remotes/git-svn Unstaged changes after reset: M three.txt Sleeping... M three.txt Committed r7 M three.txt r7 = 9ebda9f54668427441daa97b0f152eb1885d266b (refs/remotes/git-svn) No changes between current HEAD and refs/remotes/git-svn Resetting to the latest refs/remotes/git-svn Unstaged changes after reset: M three.txt Sleeping... M three.txt Committed r9 M file.txt r8 = 92bcba5a1a5be41d4393be1810bed0e9417da1a8 (refs/remotes/git-svn) M three.txt r9 = 6988d79c042c21534241e4f6e82ef29056ce69bc (refs/remotes/git-svn) W: cdc341b381aab0ab01233bcc0b47d36acef75eb8 and refs/remotes/git-svn differ, using rebase: :100644 100644 928a139863b65711aa12167b81fefccfacc00d69 a063167d351d2715c1a612cd0f431ac77b9eba92 M file.txt Cannot rebase: You have unstaged changes. Please commit or stash them. rebase refs/remotes/git-svn: command returned error: 1 piotr@piotr-laptop:/tmp/d/b$ git status # On branch master # Changes not staged for commit: # (use "git add ..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working directory) # # modified: three.txt # no changes added to commit (use "git add" and/or "git commit -a") piotr@piotr-laptop:/tmp/d/b$ git log remotes/git-svn.. piotr@piotr-laptop:/tmp/d/b$ git diff diff --git a/three.txt b/three.txt index 7bfc0fd..ce447d2 100644 --- a/three.txt +++ b/three.txt @@ -1,2 +1,5 @@ three next +next +next +next piotr@piotr-laptop:/tmp/d/b$