Git revert deleted file and preserve file history -

-

suppose have file a.txt. 1 day, deleted it, committed, , pushed.

the next day, wanted revert last commit, bringing a.txt. tried using git revert, when did git blame, lines showing revert commit hash. original blame history lost.

can recover file , preserve file history, i.e., if file has not been deleted before? note must not change history commit has been pushed.

thanks!

you can this! here's how:

  1. start new branch commit preceding delete want undo.
  2. merge offending change git merge <sha> -s ours.
  3. if commit had changes besides deletion want keep:
    1. reapply changes working copy git diff <sha>^..<sha> | git apply.
    2. discard deletions (many techniques available; git checkout -p may work you).
  4. merge branch main branch (e.g. master).

this produces history 2 branches; 1 in file deleted, , 1 in it never deleted. result, git able track file history without resorting heroics such -c -c -c. (in fact, -c -c -c, file isn't "restored", because git sees new file created as copy of existing file. technique, reintroducing the same file repository.)


Comments

Post a Comment

Popular posts from this blog

mysql - FireDac error 314 - but DLLs are in program directory -

-
i getting when trying access mysql database : [firedac][phys][mysql]-314. cannot load vendor library [libmysql.dll or libmysqlld.dll] this did not happen (unchanged) code, however, have upgraded windows 10 , had reinstall delphi xe8, system configuration matter. in order try solve problem, copied both of files c:\windows\sysytem32. when did not seem work, copied them \win32\debug, generated .exe resides. i imagine doing rather stupid, can't see what. the proper solution place driver file (eg., libmysql.dll ) in application's folder, or place installation location in fddrivers.ini file: [mysql] vendor=<folder>\libmysql.dll (recent versions of documentation seem use vendorlib instead of vendor in ini file.) see rad studio documentation topics configuring drivers (firedac) , connect mysql server (firedac) more information.
Read more

c++ - Getting C2512 "no default constructor" for `ClassA` error on the first parentheses of constructor for `ClassB`? -

-
my situation follows. let there header file classdeclarations.h , have following classes declared: class classa; class classb; class classa { public: classa(int x); classa(double y); int returninteger(void) { return m_x; } double returndouble(void) { return m_y; } private: int m_x; double m_y; } class classb { public: classb(int x); int returninteger(void) { return m_x; } private: int m_x; classa m_instancea_1; } let there *.cpp file called classdefns.cpp , define methods of classes declared in classdeclarations.h : #include classdeclarations.h classa::classa(int x) : m_x(x) { } classa::classa(double y) : m_y(y) { } classb::classb(int x) : m_x(x) { // line build error occurs m_instancea_1 = classa(0); } note have commented line compiler says there error: error c2512: 'classa' : no appropriate default constructor avai...
Read more

java - How can I send the data from a imput type="file" to the controller? -

-
i have in ftl: <input type="file" id="doc6" name="documente"> in .js: var lx = $("#longx").val(); var ly = $("#laty").val(); var jud = $("#judetpunctlucru").val(); var doc6type = $("#doc6type").val(); var doc6 = $('doc6').val(); validatecoords: function (lx, ly, jud, doc6type, doc6) { var data = { lx: lx, ly: ly, jud: jud, doc6type: doc6type, doc6: doc6 }; var url = contextpath + '/validarecoord'; return getjsondata(url, data); } and in controller: @requestmapping(value = "/validarecoord", method = requestmethod.get, produces = mediatype.application_json_value) @responsebody public map<string, object> getvalidcoord(@requestparam("lx") string lx, @requestparam("ly...
Read more