git - How to back out from back out? -

-

i have backed out commit (commit#1), after realized needed commit.
have checked out commit#1. now, how can put version end of branch?

if haven't done other work, can reset current branch on commit.

git checkout yourbranch git reset --hard <sha1>

the op barnabas szabolcs advices in comments:

git reset --soft @^

(with recent git, @ alias head)

that allow keep working tree , index (of checked out old commit) intact, while resetting head previous commit in order make new 1 (with content of checked out commit).

if have done other commits, need cherry-pick commit current branch:

git checkout yourbranch git cherry-pick <sha1>

in case, checkout of old commit dangerous, leads detached head situation (except when followed git reset ---soft head^).


Comments

Post a Comment

Popular posts from this blog

What can cause "Required Package 'IndyCore' not found" when compiling a Delphi 2010 project? -

-
i have got fresh install of delphi 2010 on windows 8.1. i create new project, , under packages, select "build runtime packages". i compile , error "[dcc fatal error] e2202 required package 'indycore' not found" i have checked: package indycore140.bpl available in $bds\bin directory other indy related packages. indycore.dcp file available in $bds\lib , $bds\lib\debug. this driving me nuts. hints? this command line when enable "show command line" option (line breaks added readability): dcc command line "project2.dpr" c:\delphi\delphi2010\bin\dcc32.exe --no-config -lurtl;vcl;vclx;vclimg;vclactnband;dbrtl;vcldb;vcldbx;bdertl;vcltouch;xmlrtl; dsnap;dsnapcon;teeui;teedb;tee;adortl;vclsmp;vclie;inet;inetdb;webdsnap; websnap;inetdbbde;inetdbxpress;soaprtl;dbxcommondriver;dbxclientdriver; dbxinterbasedriver;dbxmysqldriver;dbexpress;dbxcds;tdbf;intrawebdb_100_140; intraweb_100_140;indycore;indysystem;indyprotocol...
Read more

Change the color of an oval at click in Java AWT -

-
i have draw ovals in java, , @ click change color. beginning tried change color after 20 ms, doesn't work. my code is: public class mycomponentnew extends frame { public graphics2d g2d; public mycomponentnew(string title) { super(title); setsize(400, 550); } @override public void paint(graphics g) { this.g2d = (graphics2d) g; this.g2d.setcolor(color.red); this.g2d.filloval(10, 55, 50, 100); } public void changecolor () { this.g2d.setcolor(color.blue); this.g2d.filloval(10, 55, 50, 100); } } and in class main method have: mycomponentnew m; m = new mycomponentnew("fereastra cu baloane"); m.setvisible(true); m.addwindowlistener(new windowadapter() { @override public void windowclosing(windowevent we) { system.exit(0); } }); try { thread.sleep(20); } catch(interruptedexception e) {} m.changecolor(); the color of oval remains red. ...
Read more