Re: Git rebase basics

[lancelyons <llyons2@cox.net>]

Sorry about that.. I thought I was being pretty descriptive but maybe I
missed something.

After we setup Git (msysgit) and set it up using Apache with active
directory authentication, I added a repository using git init --bare then I
copied my files I wanted to add to the repository and did a git add . and
git commit -a

So that all worked.   We have done several clones using git clone with this
remote repo.  We have also done  git push and git pull to verify everything
is working ok.   Everything was working fine.

So back to my original train of though.

I am trying to learn more about rebase so i have cloned the central repo two
times  (I call the central repo the origin) doing the following (to help you
understand)

git clone https://servername:port/repopath c:\clonedrepo1

git clone https://servername:port/repopath c:\clonedrepo2

and then made changes to this cloned copy (clonedrepo1) and pushed two
commits back to origin.
(git commit -a  two times)

so now I have the following in the remote repo (origin)   

origin -->  C1 --> C2

(Note to help you understand  C1 = commit 1 and c2 = commit 2, etc)

In the other cloned copy (clonedrepo2), which I consider a branch, I have
made two more commits  C3 and C4

clonedrepo2 --> C3 -->  C4

I am able to easily pull from origin to get my clonedrepo2 to look like 
clonerepo2 --> C3 --> C4 --> C1 --> C2 using git pull origin  or git pull
https://servername:port/repopath

however I was wanting to rebase the clonedrepo2 branch so that it shows   
clonerepo2 -> C1 --> C2 --> C3 --> C4

In other words I am wanting to rebase clonedrepo2 to the master of the
origin.


I thought the command to do this was   git rebase origin master but that
doesnt work and I get

C:\clonedrepo2>git rebase origin master
Switched to branch 'master'
Your branch is ahead of 'origin/master' by 2 commits.
Current branch master is up to date.

I know my my branch is ahead by c3 and c4 but it does not have C1 and C2

Thoughts.

--
View this message in context: http://git.661346.n2.nabble.com/Git-rebase-basics-tp7561468p7561489.html
Sent from the git mailing list archive at Nabble.com.