<div dir="ltr">On Tue, Oct 22, 2013 at 2:03 PM, Aron Ahmadia <span dir="ltr"><<a href="mailto:aron@ahmadia.net" target="_blank">aron@ahmadia.net</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote">
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">As long as you know what you're doing :)<div><br></div><div>git push -f</div></div></blockquote><div>
<br></div><div>Jed was advocating</div><div><br></div><div> git push origin +barry/myshit</div><div><br></div><div> Matt</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div class="HOEnZb"><div class="h5"><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Oct 22, 2013 at 3:01 PM, Barry Smith <span dir="ltr"><<a href="mailto:bsmith@mcs.anl.gov" target="_blank">bsmith@mcs.anl.gov</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><br>
Thanks<br>
<br>
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)<br>
<br>
~/Src/petsc barry/reduce-dmsetup-da-memoryusage $ git push<br>
To git@bitbucket.org:petsc/petsc.git<br>
! [rejected] barry/reduce-dmsetup-da-memoryusage -> barry/reduce-dmsetup-da-memoryusage (non-fast-forward)<br>
error: failed to push some refs to 'git@bitbucket.org:petsc/petsc.git'<br>
hint: Updates were rejected because the tip of your current branch is behind<br>
hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')<br>
hint: before pushing again.<br>
hint: See the 'Note about fast-forwards' in 'git push --help' for details.<br>
<div><div><br>
<br>
<br>
On Oct 22, 2013, at 1:55 PM, Aron Ahmadia <<a href="mailto:aron@ahmadia.net" target="_blank">aron@ahmadia.net</a>> wrote:<br>
<br>
> git rebase -i HEAD~2/3<br>
><br>
><br>
> On Tue, Oct 22, 2013 at 2:53 PM, Barry Smith <<a href="mailto:bsmith@mcs.anl.gov" target="_blank">bsmith@mcs.anl.gov</a>> wrote:<br>
><br>
> I would like to put together the last two commits in a branch, how do I do this?<br>
><br>
> git rebase -i<br>
><br>
> doesn't help because it only handles the last commit. How do I tell git to go back one commit in the rebase?<br>
><br>
> Thanks<br>
><br>
> Barry<br>
><br>
><br>
<br>
</div></div></blockquote></div><br></div>
</div></div></blockquote></div><br><br clear="all"><div><br></div>-- <br>What most experimenters take for granted before they begin their experiments is infinitely more interesting than any results to which their experiments lead.<br>
-- Norbert Wiener
</div></div>