All of lore.kernel.org
 help / color / mirror / Atom feed
From: Steve French <smfrench@austin.rr.com>
To: git@vger.kernel.org
Subject: git rebase syntax question
Date: Fri, 11 Aug 2006 13:12:16 -0500	[thread overview]
Message-ID: <44DCC880.1080108@austin.rr.com> (raw)

I am missing something in the git rebase syntax ... am simply trying to 
remove some "empty" merge messages from my tree like:

commit 7538943ddf992b6ee5ec21d460f1eecc0afdb6f3
Merge: 9f73763... bbab152...
Author: Steve French <sfrench@us.ibm.com>
Date:   Fri Aug 11 17:46:20 2006 +0000

    Merge ../cifs-tmp/

and reorder the commits so my commits that are not in the parent are the 
most recent

The git repository is cloned from 
/pub/scm/linux/kernel/git/torvalds/linux-2.6.git and has one branch and 
history like
         ...->A->MyCommits->B->MoreOfMyCommits->C->EmptyMergeMessages
and I want to make my master look like
         ...->A->B->C->MyCommits->MoreOfMyCommits
   

where "MyCommits" and "MoreOfMyCommits" are not in 2.6.18-rc4 yet, and  
A, B, and C are the parent's (mainline kernel) commits (e.g. A is up to 
about 2.6.18-rc1, B are those between rc1 and rc3, C would be rc4 and 
later etc.)

I tried doing the obvious
    "git rebase master"
but that appears to be a no op
    stevef@smf-t41p:~/cifs-2.6> git-rebase master
    Current branch master is up to date.
    stevef@smf-t41p:~/cifs-2.6> git-rebase origin
    Current branch master is up to date.



How does one do this?

             reply	other threads:[~2006-08-11 18:11 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-08-11 18:12 Steve French [this message]
2006-08-11 22:07 ` git rebase syntax question Jeff King

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=44DCC880.1080108@austin.rr.com \
    --to=smfrench@austin.rr.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.