On 2015-09-05, at 5:27 PM, Michael <keybou...@gmail.com> wrote:

> Ok, first question: Why does
> git rebase  --onto HEAD RemoveDebugSpam
> 
> not work? It results in no change -- it does not move "RemoveDebugSpam" to 
> the current HEAD (on a newly checked out test branch)

Even stranger: I attempted "git rebase -i --onto HEAD RemoveDebugSpam". Here's 
what the editor gave me:

keybounceMBP:Finite-Fluids michael$ git rebase -i --onto HEAD RemoveDebugSpam

pick 8fab657 Conflict fix for gitignore
pick 4877a01 Srg/Mcp conf files are needed in the eclipse environment
pick 0973d6e Update mcmod.info. Remove it from bin/ as that's an output.
pick 797dcf9 Run our Block table change after CofhCore (override them). Fixes 
compatibility with CofhCore / Redstone Flux /
RfTools.

# Rebase 6bf3b0c..797dcf9 onto 797dcf9 (4 command(s))
#

Those are the commits made on the current branch after "RemoveDebugSpam" was 
forked off from it. 
RemoveDebugSpam was one commit that removed several debugging printf's.
The 4 commits listed are the 3 commits made to master, and then 8fab was the 
first merge onto the RebaseSimpleMerge branch off of master.

keybounceMBP:Finite-Fluids michael$ git status
On branch RebaseSimpleMerge
You are currently editing a commit while rebasing branch 'RebaseSimpleMerge' on 
'797dcf9'.
  (use "git commit --amend" to amend the current commit)
  (use "git rebase --continue" once you are satisfied with your changes)

nothing to commit, working directory clean
keybounceMBP:Finite-Fluids michael$ 

===

Just in case "HEAD" doesn't work there:

keybounceMBP:Finite-Fluids michael$ git rebase -i --onto RebaseSimpleMerge 
RemoveDebugSpam

pick 8fab657 Conflict fix for gitignore
pick 4877a01 Srg/Mcp conf files are needed in the eclipse environment
pick 0973d6e Update mcmod.info. Remove it from bin/ as that's an output.
pick 797dcf9 Run our Block table change after CofhCore (override them). Fixes 
compatibility with CofhCore / Redstone Flux /
RfTools.

# Rebase 6bf3b0c..797dcf9 onto 797dcf9 (4 command(s))
#
# Commands:
# p, pick = use commit
# r, reword = use commit, but edit the commit message
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
# f, fixup = like "squash", but discard this commit's log message
# x, exec = run command (the rest of the line) using shell
#
# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
# However, if you remove everything, the rebase will be aborted.
#
# Note that empty commits are commented out
~                                                                               
                                           
~                                                                               
                                           
~                                                                               
                                           
~                                                                               
                                           
~                                                                               
                                           
~                                                                               
                                           
~                                                                               
                                           
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git reset'
rebase in progress; onto 797dcf9
You are currently rebasing branch 'RebaseSimpleMerge' on '797dcf9'.

nothing to commit, working directory clean
Could not apply 8fab657fa5aaeb50fab270247affe0cad963c31a... Conflict fix for 
gitignore
keybounceMBP:Finite-Fluids michael$ 

The problem: "RebaseSimpleMerge" is 797dcf9'. The branch I want to move -- 
RemoveDebugSpam -- is 6bf3b. 

Help? Please?

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to