git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Michael Witten <mfwitten@gmail.com>
To: lancelyons <llyons2@cox.net>
Cc: git@vger.kernel.org
Subject: Re: Git rebase basics
Date: Thu, 14 Jun 2012 00:07:51 +0000	[thread overview]
Message-ID: <CAMOZ1BudfqB2wf2emGL_J5kvEkF=dz0y4h6LCA7W0RCWCCyg2A@mail.gmail.com> (raw)
In-Reply-To: <1339621152946-7561468.post@n2.nabble.com>

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

> 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

  reply	other threads:[~2012-06-14  0:08 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-13 20:59 Git rebase basics lancelyons
2012-06-14  0:07 ` Michael Witten [this message]
2012-06-14  2:59 ` lancelyons
2012-06-14  4:39   ` Hilco Wijbenga
2012-06-14 16:01     ` lancelyons
2012-06-14 16:28       ` Michael Witten
2012-06-14 17:21         ` lancelyons
2012-06-14  5:00   ` Michael Witten

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAMOZ1BudfqB2wf2emGL_J5kvEkF=dz0y4h6LCA7W0RCWCCyg2A@mail.gmail.com' \
    --to=mfwitten@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=llyons2@cox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).