Re: Git rebase basics

From: Michael Witten <mfwitten@gmail.com>
Date: Jun 14, 2012, 00:07 UTC
Message-ID: <CAMOZ1BudfqB2wf2emGL_J5kvEkF=dz0y4h6LCA7W0RCWCCyg2A@mail.gmail.com>
In-Reply-To: <1339621152946-7561468.post@n2.nabble.com>

On Wed, Jun 13, 2012 at 8:59 PM, lancelyons <llyons2@cox.net> wrote:

Show 32 quoted lines

> I am trying to learn git on my own.  I have setup our own server for git
> using https and have cloned this repository and have done pushes and pulls
> with no problem.
>
> I am trying to learn more about rebase so i have cloned the central repo (I
> call this origin)
> and made changes to the cloned copy and pushed two commits to origin.
>
> so I have the following.
>
> origin -->  C1 --> C2
>
> in my cloned copy which I consider a branch
>
> I have made two more commits  C3 and C4
>
> clone --> C3 -->  C4
>
> I am able to easily pull from origin to get my clone to look like  clone -->
> C3 --> C4 --> C1 --> C2
>
> I was wanting to rebase the clone branch so that it shows    clone -> C1 -->
> C2 --> C3 --> C4
>
> I though the command to do this was   git rebase origin master but that
> doesnt work.
>
>
>
> Any ideas on what I am doing wrong?
>
> thanks

It's amazing to me that people regularly describe their problems not with the precision of a universally reproducible sequence of command lines, but rather with some imprecise, personal language concocted in the very midst of using it.

Sir. You are trying to figure out how to use git commands. Why not illustrate your difficulties by writing out a sequence of... well... GIT COMMANDS, which everyone on this list may easily try and, most importantly, understand with precision?

  $ git init origin
  $ cd origin
  ...

List your expected results and your actual results.

In fact, by distilling your issue into a workable example, you will probably figure the whole thing out anyway.

Now, don't worry about writing another email. Somebody who has more time to burn will answer your original email cordially enough (and chastise me in the process by remarking how your scenario is perfectly easy to understand as is).

SINCERELY, Michael Witten