git - How to merge only a single file from a certain commit -


I have 2 files that are created in a fixed branch and I would like to merge only one file with committed changes. How should I do this?

Merge the list of paths (paths) that there is no alternative. Instead, you have to do this manually, by instructing git to stop after merge, before reducing it. You can then reset the second file to the HEAD contents and keep those contents on the disk, resulting in only the first merge. For example, if there is a question in the commit 0123abc and the file you want to cancel with the merge is file2.txt : 

 < Code> git merge --no-commit - no-ff 0123abc git reset HEAD file2.txt git checkout - file2.txt

Comments

Post a Comment

Popular posts from this blog

scala - Play Framework - how to bind form to a session field -

Is there any way, I can get some parameters from the header, cookies (log in userId in my case) , And then apply it in a form which I know who will deposit the ticket? SupportForm supportForm: form [supportTicket] = form (mapping ("question" -> text, "priority" -> text) (apply support ticket. (HelpText.update) What are the good practices here? What is the call to apply the request, when I can use it (and also a good practice?) Edit An issue, absolutely deceiving anyone if I were to create a hidden area with this value. It could Ript, but the issue may be re-used in any way to verify and return the form, it can not be sure how it ....
Read more

c++ - Why does Visual Studio Release build break on non-executing code line -

When I created my C ++ program with the default release configuration in Visual Studio 10, I put a breakpoint on one line Who should never be reached. What confunded me was that when the program is running then it stopped at the breaking point. Adding a volatile statement and transferring this line to the break point does not break the execution of the code where the brake appears (though does not produce the same behavior as creating a minimum project with this function). Why is the "Release Debugger" (?) Step on this line and when executing breakpoints are executed? If I keep going after the break then false statement continues to return code execution. bool bounding box :: Cutting (int32_t xpos, int32_t ypos, int32_t dx, int32_t dy) const {int32_t intersectionX; Int32_t intersections; If ((dx> 0 & amp; amp; and & amp; xpos> rights) || (dx gt; Top) || (D & LT; 0 & amp; AOPO & Lt; BOT)) Return; If (DX! = 0) {intersection Y = ypos + (left...
Read more

Firefox reacting to JQuery setTimeout that doesn't apply -

& lt; - Only note the first image. I think some jquery is not working in Firefox, where there seems to be a problem ... but there is IE (I know, I know) var hover = $ ('# par1'), box = $ ('.sq1'); Hover.hover (function () {box.toggleClass ('index2');}); and var linkloc = $ ('# par1'), link = $ ('# frnt1'); Linkloc.on ('mouseenter', function () {function linkadd () {link.html ("& lt; a target = _blank href = http: //www.google.co.uk> & lt; img src = small1 .JPG / & gt; & lt; / a & gt; ");} Set Timeout (linkAD, 1500)}); Linkloc.on ('mouseleave', function () {link.html ("& lt; img src = small1.JPG />");}); I appreciate that the code can be a bit messy, but I'm still learning as I go. The problem now is that the top slice of the code is reacting down to the setout. (It revolves around time with setTimeout repeatedly) even though the name of the function is c...
Read more