git/list[1] front-page[2] threads[3] people[4] search[5] about
 

git rebase syntax question

From
SFSteve French <smfrench@austin.rr.com>
Date
Aug 11, 2006, 18:12 UTC
Message-ID
<44DCC880.1080108@austin.rr.com>

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?
Next: Jeff King
Message 1 of 2 in “git rebase syntax question”
  1. Steve FrenchAug 11, 2006
  2. Jeff KingAug 11, 2006

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.