[petsc-dev] how to rebase together last two commits in branch?

[Aron Ahmadia]

As long as you know what you're doing :)

git push -f




On Tue, Oct 22, 2013 at 3:01 PM, Barry Smith <bsmith at mcs.anl.gov> wrote:

>
>    Thanks
>
>   Ok, that works but now when I try to push it won't allow. is there some
> way to force the push (no one is using this branch it is in a pull request
> and needed cleaning)
>
> ~/Src/petsc  barry/reduce-dmsetup-da-memoryusage $ git push
> To git at bitbucket.org:petsc/petsc.git
>  ! [rejected]        barry/reduce-dmsetup-da-memoryusage ->
> barry/reduce-dmsetup-da-memoryusage (non-fast-forward)
> error: failed to push some refs to 'git at bitbucket.org:petsc/petsc.git'
> hint: Updates were rejected because the tip of your current branch is
> behind
> hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
> hint: before pushing again.
> hint: See the 'Note about fast-forwards' in 'git push --help' for details.
>
>
>
> On Oct 22, 2013, at 1:55 PM, Aron Ahmadia <aron at ahmadia.net> wrote:
>
> > git rebase -i HEAD~2/3
> >
> >
> > On Tue, Oct 22, 2013 at 2:53 PM, Barry Smith <bsmith at mcs.anl.gov> wrote:
> >
> >   I would like to put together the last two commits in a branch, how do
> I do this?
> >
> >  git rebase -i
> >
> > doesn't help because it only handles the last commit. How do I tell git
> to go back one commit in the rebase?
> >
> >    Thanks
> >
> >    Barry
> >
> >
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20131022/2c2ba0b1/attachment.html>