sorry - copy/paste error.
git rebase -i f303cd651cc9f18b5b8505d3b571425f3b3e5c1a
[f303cd651cc9f18b5b8505d3b571425f3b3e5c1a is commit in master - from where
mark/snes-ex56c branched off]
I use 'master..mark/snes-ex56c' to determine this.
Satish
On Wed, 25 May 2016, Mark Adams wrote:
> >
> >
> > Ok - I've done a 'rebase master' and 'push -f' on mark/snes-ex56c
> >
> > You might want to do:
> >
> > git checkout mark/snes-ex56c
> > git rebase -i 7216b81e99debbb3a0e1c5dd0b26b0d24a8a5ac0
> >
> >
> done, but there was nothing in the rebase ("noop"). This is what I see:
>
> noop
>
> # Rebase 7216b81..7216b81 onto 7216b81 (1 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
> # d, drop = remove commit
> #
> # 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
>
