What is "git" syntax for getting just the unified diff of how a single commit X changed a single file Y? -

-

I'm writing the code to write the program and to run the git command and to learn the git at the same time. Am I reading man pages wrongly or do not I want to do this?

The following will tell me how the change between the two commits has changed:

git diff COMMIT1..COMMIT2 - MYFILE

Good .

But, suppose I just want to ask how the COMMITX has changed the file without specifying the permit. The syntax in my imagination would be something like this: 

  git diff COMMITX - MYFILE

or this: 

  Git diff COMMITX ^ .. COMMITX - MYFILE

But the above command does not work (for me).

The following work is in the sense that the unified difference shows me how COMMITX has changed the MYFILE, but it also includes other things, such as author, date, checkin msg. Stripping extra luggage is easy, but it seems that it should not be something I should do. What is the command? Do I have to understand something simple? 

  git show COMMITX - MYFILE

EDIT1: I'm displaying real output here from my "GIT Bash" window Converted "show" to "diff", and no output was found. 

 $  git show 789 9 / dir1 / file3.txt  789e 948bce733dab9605bf8eb51584e3b9a2eba3 Author: Cori Date: Sun Oct 11 21:54:14 200 9 -0500 My msg diff - Git a / dir1 / file3.txt b / dir1 / file3.txt index a351259..cf2bd35 100644 --- a / dir1 / file3.txt +++ b / Dir1 / file3.txt @@ -4,5 +4, 7 @@ Cdf EF + a new line + another new line BoAstar / C / Temp / Maggate (Master) $ $ b  Administrator @ biostar / c / Try / gagit (master)

Try: 

  git shows --pretty = Format: & lt; Commitid & gt; - & lt; File & gt;

How it looks: 

  diff --git a / config.yb / config.y Index 7750514..f051b99 100644 --- A / Config.y +++ b / config.y @@ - 454,8 +454,8 @@ Diffinage Game: TYPE_DEFINE_GAME '{'} game_definitions '}' {- num_games = ncnf; Ncnf ++; + Num_games = NCNF; };

There is still an empty line in the beginning (due to Marcadoon limitations not shown here), but patch will be ignored with pleasure (in fact, It also defines the header content as git show output).

- Beautiful = oneline is also useful:

3ed347de4c6e0e3230f651f82aabf964c6d16100 A bug Fix, where more than one defined game can not be seen or there is no difference / a / config.yb / config.y index 7750514..f051b99 100644 --- a / config.y +++ b / config .y @@-454,8 +454,8 @@ Diffinage Game: TYPE_DEFINE_GAME '{'} game_definitions '}' {- num_games = ncnf; Ncnf ++; + Num_games = NCNF; };

He said, if you are formatting a patch to deposit somewhere, then not left that stuff. In fact, use git format-patch and enjoy it. Third party patching tools will happily ignore that extra metadata, and for projects using git, apply git will use the provided message and the author's line, so that It will be easy to implement.


Comments

Post a Comment

Popular posts from this blog

MySql variables and php -

-
I am getting an error with php in order to format mysql_query () in php to format this string What is the right way? SELECT SELECT SELECT (*) Agents @AgentCount; User_Agent_English, User_Angent_Oursal, US.___Gent_Aginal, COUNT (User_Agent_Percade) ACC, COUNT (*) / (AgentCount) Percentage by agents user_agent_preser order DEC limit limit 50; In PHP, how am i setting $ query $ query = "SELECT count (*) agents @ agentcount; SELECT user_agent_parsed, User_agent_original , COUNT (user_agent_parsed) ascount, COUNT (*) / (@AgentCount) as a percentage by user_agent_parced by URI date DESC limit 50 "; This exact query will work properly if I put it in MySQL directly through a command line session. Do I need to release two separate php calls from mysql_query () and store the results first? I get the following error: There is an error in your SQL syntax; Instead of using a sub-selection and instead of using the 'SELECT user_agent_parsed, user_agent_original, ne...
Read more

url rewriting - How to implement the returnurl like SO in PHP? -

-
This URL should work even after the rewrite. Is this possible? Otherwise, I can only hardcoded everything If you are trying to create a login system with redirection You need to use the HTTP_REFERER header to find out where the user came from so that you can send it back there. The best way to do this is to use something like this in your login form: // - Login php & Lt; Input type = "password" name = "password" /> & Lt; Input type = "hidden" name = "returnrelale" value = "& lt ;? php echo $ redirectURL ;? & gt;" / & Gt; & Lt; / Form & gt; Please note that some ISP, browser or proxy will delete the referrer header, so you can not rely on each user to work fully. If you use a statement, to check whether the header exists or not, you can send those users back to the homepage or whatever. Edit If you are looking to use $ _SERVER ['REQUEST_URI'], if you are running Apache It sho...
Read more

Which Python client library should I use for CouchdB? -

-
I am starting to experiment with CouchDB because it looks like we have the right solution to certain problems That all the work will be on a new project, which does not have any legacy dependency, which the client library will suggest you use, and why? If we overlap any of the OS. Freeband is available only in the collection of its ports, but asks to use the library's project website. None of those people are Ubuntu, which is only with ships, since those two OSAs are not common in libraries, I am probably installing something from source (and hopefully if I have time, then Ubuntu and FreeBSD People pack the package). For those interests, I want to use CouchDB as a convenient intermediate storage space for data passed between different services - think of a message bus system, but less formalities with. For example, we have daemons that download and pars the web page, then send an interesting bit to other daemons for further processing. Many of them are ill-defined until the...
Read more