Some more info...:
stubbsa@VFNZV95336 /cygdrive/c/dev
$ git merge-base HEAD git-svn
5bfad5dee44fd18f7c3a39e7dcb234828c840c24
commit 5bfad5dee44fd18f7c3a39e7dcb234828c840c24
Author: boses <boses@c07779a9-5238-0410-8e60-f4d13a72d009>
Date: Thu Aug 7 01:28:44 2008 +0000
Siebel Java Interface Merged
git-svn-id:
http://10.107.6.150/repos/portal/oasis/branches/oasis-cr@3273
c07779a9-5238-0410-8e60-f4d13a72d009
$ git branch -a
emailTemplateWork
hibernate
integration
* master
git-svn
git-svn@1775
git-svn@2473
laptop/emailTemplateWork
laptop/hibernate
laptop/master
temp/master
stubbsa@VFNZV95336 /cygdrive/c/dev
$ git checkout hibernate
Switched to branch "hibernate"
stubbsa@VFNZV95336 /cygdrive/c/dev
$ git checkout master
Checking out files: 100% (295/295), done.
Switched to branch "master"
stubbsa@VFNZV95336 /cygdrive/c/dev
$ git svn rebase
First, rewinding head to replay your work on top of it...
could not detach HEAD
rebase refs/remotes/git-svn: command returned error: 1
stubbsa@VFNZV95336 /cygdrive/c/dev
$ git rebase
fatal: Needed a single revision
invalid upstream
stubbsa@VFNZV95336 /cygdrive/c/dev
$ git rebase git-svn
First, rewinding head to replay your work on top of it...
could not detach HEAD
2008/8/7 Tony Stubbs <antony.stubbs@xxxxxxxxx>:
> Having trouble rebasing against svn off a clean repo.
>
> I am using windows / cygwin.
>
> Here's the output:
>
> stubbsa@VFNZV95336 /cygdrive/c/dev
> $ git status
> # On branch master
> nothing to commit (working directory clean)
>
> stubbsa@VFNZV95336 /cygdrive/c/dev
> $ git svn rebase
> First, rewinding head to replay your work on top of it...
> could not detach HEAD
> rebase refs/remotes/git-svn: command returned error: 1
>
>
> stubbsa@VFNZV95336 /cygdrive/c/dev
> $
>
> I already tried asking on the channel...
> Any ideas? I'm kind of stuck as I have commits I need to dcommit.
>
> p.s. git stash also shows:
> stubbsa@VFNZV95336 /cygdrive/c/dev
> $ git stash
> No local changes to save
>
--
___________________________
http://stubbisms.wordpress.com/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
