    git diff &gt; patchfile

and

    patch -p1 &lt; patchfile

work but as many people noticed in comments and other answers patch does not understand adds, deletes and renames. There is no option but `git apply patchfile` if you need handle file adds, deletes and renames.

---

**EDIT** December 2015

Latest versions of `patch` command (2.7, released in September 2012) *support most features of the &quot;diff --git&quot; format, including renames and copies, permission changes, and symlink diffs* (but not yet binary diffs) ([release announcement][1]). 

So provided one uses current/latest version of `patch` there is no need to use `git` to be able to apply its diff as a patch.


  [1]: https://savannah.gnu.org/forum/forum.php?forum_id=7361

try this:

    patch -p1 &lt; patchfile

Use 

    git apply patchfile
if possible.

    patch -p1 &lt; patchfile 
has potential side-effect. 

`git apply` also handles file adds, deletes, and renames if they&#39;re described in the `git diff` format, which `patch` won&#39;t do. Finally, `git apply` is an &quot;apply all or abort all&quot; model where either everything is applied or nothing is, whereas patch can partially apply patch files, leaving your working directory in a weird state. 

I use

    patch -p1 --merge &lt; patchfile

This way, conflicts may be resolved as usual.

&lt;a href=&quot;http://www2.lib.uchicago.edu/keith/tcl-course/emacs-tutorial.html&quot;&gt;This article&lt;/a&gt; says that &quot;Emacs has redo because you can reverse direction while undoing, thereby undoing the undo&quot;.

What does this mean? How can a user &#39;redo&#39; with Emacs?

How do you &#39;redo&#39; changes after &#39;undo&#39; with Emacs?

How can I check if a variable is empty in Bash?


How to find whether or not a variable is empty in Bash

How can my client apply patch created by `git diff` without git installed?
I have tried to use `patch` command but it always asks file name to patch.

How to apply `git diff` patch without Git installed?

<p>How can my client apply patch created by <code>git diff</code> without git installed?
I have tried to use <code>patch</code> command but it always asks file name to patch.</p>


Coming from an svn background, I had this question:

https://stackoverflow.com/questions/1138990/git-equivalent-of-svn-status-u

(what is the git equivalent of `svn status -u`)

And I understand, you do:

    git fetch
    git log ..origin/master

But, I&#39;m guessing the `origin/master` part depends on the branch? It wouldn&#39;t necessarily be master if I was tracking a remote branch?

I also don&#39;t understand the `git merge origin/master` precisely.  I&#39;m guessing that just means that `git fetch` grabbed the changes from the remote and put them into the git database system as origin/master and I&#39;m in just master?  What if I fetched changes, check what was done, am horrified by the changes and don&#39;t want to merge?  How do I basically abandon them?  

understanding git fetch then merge

i use github and have successfully added and synched files on my laptop in the past. 

as of recent i started getting &quot;**PuTTY Fatal Error: Disconnected: No supported authentication methods available**&quot; after running:

git pull origin master (or push)

however

ssh git@github.com returns the correct response:
ERROR: Hi username! You&#39;ve successfully authenticated, but GitHub does not provide shell access
Connection to github.com closed.

after digging around on github i found this morcel:

**No supported authentication methods available**
You should be aware of the environment variable GIT_SSH, which is used by git to find your ssh-speaking client, if ssh doesn’t work for you. The git install may be using plink.exe (via GIT_SSH) to perform the authentication. If so, make sure you have pageant.exe running, and the key you created for github loaded into it. This provides the key to plink.exe; without it, the above error will occur.

not sure what plink.exe or peagant.exe is.. and the fact that ssh git@github.com seems to authenticate correctly makes me wonder what the best solution here is.. i certainly don&#39;t want to overcomplicate my setup if not necessary. 

github: No supported authentication methods available

When I attempt to run certain commands (like git push, for example) from a git Bash on Windows 7 (64bit) I get the error:

    The program can&#39;t start because libiconv2.dll is missing from your computer

I have searched exhaustively for a solution to this.  
The most I can find is an issue thread at the google code site ([Issue 419][1]) and a few other blogs here and there. As far as I can tell none of the suggestions offered in the posts will actually solve my issue.

I have tried re-installing. I have tried adding `$GIT/bin` to the `PATH`.  
I can verify that the dll is in the `$GIT/bin` directory...but still I cannot push to remote.

I have a working install of msysgit on another Windows 7 box, and I installed the same way in both situations... so needless to say I am quite confused.

Any help on this would be most appreciated.

Thanks,


  [1]: http://code.google.com/p/msysgit/issues/detail?id=419

Git for Windows - The Program can&#39;t start because libiconv2.dll is missing

I&#39;m trying to do a fancy stuff here with Git hooks, but I don&#39;t really know how to do it (or if it&#39;s possible).

What I need to do is: in every commit I want to take its hash and then update a file in the commit with this hash.

Any ideas?

In Git, how can I write the current commit hash to a file in the same commit

I noticed recently that the project files my text editors use (along with some other junk) got added the git repository for the project.  Since they aren&#39;t actually part of the project, I&#39;d like to remove them, but `git rm` doesnt remove the old versions from the repository, and I couldnt find anything else that looks promising.

How can I completely remove a file from a git repository?

For a given file in a Mercurial repository, how can you see the revision history?

And how can you diff two revisions of the file?  

Ideally doing all this with visual tools (we use ExamDiff to do some other diffs).

I&#39;d say this is basic source control functionality but I can&#39;t seem to figure out how to do this with Mercurial.

How to view revision history for Mercurial file?

I am writing a simple Bash script to detect when a folder has been modified.

It is something very close to:

    ls -lR $dir &gt; a
    ls -lR $dir &gt; b

    DIFF=$(diff a b) 
    if [ $DIFF -ne 0 ] 
    then
        echo &quot;The directory was modified&quot;

Unfortunately, the if statement prints an error: [: -ne: unary operator expected

I am not sure what is wrong with my script, would anyone please be able to help me?

Thank you very much!

Jary

Bash: using the result of a diff in a if statement

I setup `git diff` to wrap into vimdiff, using &quot;[Git Diff with Vimdiff][1]&quot; as a guide, and it&#39;s working as expected unless there are many files with changes. 

When there are multiple files with changes and I run `git diff`, it opens the first file and, after quitting the first instance of vimdiff, I&#39;m presented with the following message:

    external diff died, stopping at filename

This is a completely different behavior than I am used to.  I had a similar setup in the past with SVN and, when diffing against multiple files, I would review the first file, then write and quit using `:wq` and the next file with differences would open up.

This is not the case with Git. I tried `:n[ext]`, but doing so does not fill the left window with the original file so that it can be diffed against the modified version.
         

  [1]: http://technotales.wordpress.com/2009/05/17/git-diff-with-vimdiff/

Viewing all `git diffs` with vimdiff

I have a working copy of a repository on my machine, and I know that it has been updated on the server. I would like to know how to get the difference between the new version and the version in my working copy by using `svn` command line arguments.

Is there a way for me to do this?

Check diff against file on the server

How can you determine all the files that changed in a given changeset?  

I&#39;m not looking for a diff in this case, just a list of add/remove/modifications.

`hg log -vprX` does a list of diffs but I just want the files.

Mercurial - all files that changed in a changeset?

I don&#39;t see a difference between the output of &#39;git format-patch&#39; and &#39;git diff&#39;, is there any? And won&#39;t I be able to use &#39;git diff&#39; to produce a patch and then apply it using git apply?

My problem is that I have changes added to the index, but apparently git format-patch only accepts commits, so if I can use the output of diff, then I can use this command to produce a patch for the changes in the index:

    git diff --cached &gt; index.patch


What is the difference between &#39;git format-patch and &#39;git diff&#39;?

Is there any straightforward way to modify a binary from the commandline?
Let&#39;s say I know that my binary contains 1234abcd and i want to change it to 12FFabcd or FFFFabcd or maybe even FF34FFabc0 (you get the idea) :-)

How might I achieve that without using any special purpose tools like http://stahlworks.com/dev/swiss-file-knife.html or similar.

It would be great to do it just from the commandline with only standard linux tools.

Or maybe even better instead for searching for the hex string i want to replace directly writing FF at Offset 0x10000, 12 at Offset 0x100001 and so on.

It should be scriptable and run directly from the commandline. I am looking for something like &quot;binary-which-is-included-in-the-distro --write AB --at-offset 100000 --file thebinary.bin&quot;. I am quite sure that it is possible with &quot;dd&quot;, but I wasn&#39;t able to wrap my head around the man page.

Any idea?

Thanks in advance!

Write byte at address (hexedit/modify binary from the command line)

I&#39;ve recently discovered git&#39;s `patch` option to the `add` command, and I must say it really is a fantastic feature.
I also discovered that a large hunk could be split into smaller hunks by hitting the &lt;kbd&gt;s&lt;/kbd&gt; key, which adds to the precision of the commit.
But what if I want even more precision, if the split hunk is not small enough?

For example, consider this already split hunk:

    @@ -34,12 +34,7 @@
       width: 440px;
     }
     
    -/*#field_teacher_id {
    -  display: block;
    -} */
    -
    -form.table-form #field_teacher + label,
    -form.table-form #field_producer_distributor + label {
    +#user-register form.table-form .field-type-checkbox label {
       width: 300px;
     }

 
How can I add the CSS comment removal only to the next commit ? The `s` option is not available anymore!

Can I split an already split hunk with git?

I need to write a script that creates patches for a list of SHA-1 commit numbers.

I tried using `git format-patch &lt;the SHA1&gt;`, but that generated a patch for each commit since that SHA-1 value. After a few hundred patches were generated, I had to kill the process.

Is there a way to generate a patch only for the specific SHA-1 value?


How can I generate a Git patch for a specific commit?

I have two tags in my git in same branch. There are at least 5-6 commits between them. How can I create a single patch between the two tags so that it can be applied to a GitHub repo?

Content Type	Original Author	Original Content on Stackoverflow
Question	Andrey Kuznetsov	View Question on Stackoverflow
Solution 1 - Git	Andrey Kuznetsov	View Answer on Stackoverflow
Solution 2 - Git	suppie	View Answer on Stackoverflow
Solution 3 - Git	Sola Yang	View Answer on Stackoverflow
Solution 4 - Git	denis.peplin	View Answer on Stackoverflow
Solution 5 - Git	Shashi	View Answer on Stackoverflow

How to apply `git diff` patch without Git installed?

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Solution 3 - Git

Solution 4 - Git

Solution 5 - Git

How to find whether or not a variable is empty in Bash

How do you 'redo' changes after 'undo' with Emacs?

Attributions