git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: lancelyons <llyons2@cox.net>
To: git@vger.kernel.org
Subject: Git rebase basics
Date: Wed, 13 Jun 2012 13:59:12 -0700 (PDT)	[thread overview]
Message-ID: <1339621152946-7561468.post@n2.nabble.com> (raw)

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


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

             reply	other threads:[~2012-06-13 20:59 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-13 20:59 lancelyons [this message]
2012-06-14  0:07 ` Git rebase basics Michael Witten
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=1339621152946-7561468.post@n2.nabble.com \
    --to=llyons2@cox.net \
    --cc=git@vger.kernel.org \
    /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).