You can just use `git diff` to produce a [unified diff][1] suitable for `git apply`:

    git diff tag1..tag2 &gt; mypatch.patch

You can then apply the resulting patch with:

    git apply mypatch.patch

  [1]: http://en.wikipedia.org/wiki/Diff_utility#Unified_format

To produce patch for several commits, you should use `format-patch` git command, e.g.

    git format-patch -k --stdout R1..R2

This will export your commits into patch file in mailbox format.

To generate patch for the last commit, run:

    git format-patch -k --stdout HEAD~1

Then in another repository apply the patch by `am` git command, e.g.

    git am -3 -k file.patch

See: [`man git-format-patch`][1] and [`git-am`][2].


  [1]: http://linux.die.net/man/1/git-format-patch
  [2]: http://linux.die.net/man/1/git-am

You can apply two commands

1) `git diff --patch &gt; mypatch.patch` // to generate the patch`
2) `git apply mypatch.patch` // to apply the patch`

As a complementary, to produce patch for only one specific commit, use:  

    git format-patch -1 &lt;sha&gt;

When the patch file is generated, make sure your other repo knows where it is when you use `git am ${patch-name}`

Before adding the patch, use `git apply --check ${patch-name}` to make sure that there is no confict. 



You even can do patches only for sub directory you are currently in. Just add `.`

    git format-patch -k b365cce8..80a2c18a .

Then you can apply them:

    git am *.patch

See [this answer](https://stackoverflow.com/a/52418860/4632019) for details

I have create the next Dictionary:

    var postJSON = [ids[0]:answersArray[0], ids[1]:answersArray[1], ids[2]:answersArray[2]] as Dictionary

and I get:

    [2: B, 1: A, 3: C]

So, how can I convert it to JSON?

Convert Dictionary to JSON in Swift

I used Xcode 6.1.1 to upload a new version of a prerelease app to iTunes Connect so I could distribute it to my external beta testers. I&#39;ve done this with two versions of the same app previously and it worked fine.

But this time, the upload was stuck in &quot;Processing&quot; state for over a week. I tried again (same version, new build number) and it&#39;s now been over 24 hours with no change.

The app passed validation fine.

What gives?

My prerelease app has been &quot;processing&quot; for over a week in iTunes Connect, what gives?

I work on WordPress based project and I want to patch my project at each new release version of WP. For this, I want generate a patch between two commits or tags.

For example, in my repo `/www/WP` I do this:
```bash
$ git patch-format com1..com2 --stdout &gt; &#39;~/patchs/mypatch.patch&#39;

# or

$ git patch-format tag1..tag2 --stdout &gt; &#39;~/patchs/mypatch.patch&#39;
```

`/www/WP` git natif WordPress

`/www/myproject` My git project WordPress based


The `git apply` command line doesn&#39;t work, I think because we are in different repositories.

Can I generate a patch file without a commit, just a differential and apply it to another git repository?

Thank you.

Create patch or diff file from git repository and apply it to another different git repository

I work on WordPress based project and I want to patch my project at each new release version of WP. For this, I want generate a patch between two commits or tags.
For example, in my repo <code>/www/WP</code> I do this:
<pre><code class="hljs language-c">$ git patch-format com1..com2 --stdout > '~/patchs/mypatch.patch'

# or

$ git patch-format tag1..tag2 --stdout > '~/patchs/mypatch.patch'
</code></pre>
<code>/www/WP</code> git natif WordPress
<code>/www/myproject</code> My git project WordPress based
The <code>git apply</code> command line doesn't work, I think because we are in different repositories.
Can I generate a patch file without a commit, just a differential and apply it to another git repository?
Thank you.

I have a serie of files into a stash (`stash{0}`) and I would like to `git apply` **just** some parts/hunks of these files (usually known as *Interactive mode*).

Is it possible?

I&#39;ve seen that is possible to perform a

    git stash save -p &#39;Stash name&#39;

but it seems not possible to do

    git stash apply -p &#39;Stash name&#39;

Do you know a way to achieve it?

&#39;git stash apply&#39; with Interactive Mode

I have been struggling with this for a few hours. I am on a Mac using Yosemite. I had homebrew installed, and was using git just fine. I tried doing `$git add -i` and I got this error:

&gt; Can&#39;t locate Git.pm in @INC (@INC contains:

So I followed the instructions here:
https://stackoverflow.com/questions/17736330/cant-locate-git-pm-in-inc

`$brew uninstall git` worked fine, but after I tried to `$brew install git` I&#39;ve been stuck in a terrible cycle.

    % brew install git
    
    Error: git-git already installed
    To install this version, first `brew unlink git&#39;
    % brew unlink git
    Error: No such keg: /usr/local/Cellar/git
    % brew link git
    Error: No such keg: /usr/local/Cellar/git
    % git --version
    git version 1.9.3 (Apple Git-50)
    % brew upgrade git
    ==&gt; Upgrading 1 outdated package, with result:
    git 2.2.2
    Error: /usr/local/Library/LinkedKegs/git is not a valid keg
    % brew install git
    Error: git-git already installed
    To install this version, first `brew unlink git&#39;
    %

I just want to get homebrew &amp; git back to normal and linked to the correct repo again. I&#39;m really rough around the edges at this stuff, so any help would be greatly appreciated!


No such keg: /usr/local/Cellar/git

Is there a command for logging out of git? I&#39;m turning my computer over to somebody else and don&#39;t want the git to be attached to my account in the terminal.  

Git log out user from command line

I have a master and a dev branch in my repository. I want to remove the master branch from my computer so that I don&#39;t accidentally commit to it (it&#39;s happened..). 

There are questions on here about how to delete branches locally **and** remotely, but I haven&#39;t been able to find out how to only delete a branch locally.

One answer said to use this:

    git branch -d local_branch_name

But I tried that and the branch still shows up in the GitHub application.

How to remove a branch locally?

My IntelliJ IDEA was used by another user and when I try to push to Git, I was asked a password of this user.

How can I change user in my IDEA? I tried to change global Git user, but it is not working.

Change Git user in IntelliJ IDEA

 I created a pull request and was browsing through, the differences are shown with light red/green line-brackgrounds, but some text is bolded with a red text background...

Update: Image changed to show file with some highlighted comments and some not.
![GitHub comparison view showing text with red background][1]


What does this mean?

  [1]: http://i.stack.imgur.com/hH2Kf.png

What does a red text-background mean in GitHub comparison view?

Are there any command line utilities that can be used to find if two JSON files are identical with invariance to within-dictionary-key and within-list-element ordering?

Could this be done with [`jq`][1] or some other equivalent tool?

## Examples:

These two JSON files are identical

`A`:

    {
      &quot;People&quot;: [&quot;John&quot;, &quot;Bryan&quot;],
      &quot;City&quot;: &quot;Boston&quot;,
      &quot;State&quot;: &quot;MA&quot;
    }
`B`:

    {
      &quot;People&quot;: [&quot;Bryan&quot;, &quot;John&quot;],
      &quot;State&quot;: &quot;MA&quot;,
      &quot;City&quot;: &quot;Boston&quot;
    }

but these two JSON files are different:

`A`:

    {
      &quot;People&quot;: [&quot;John&quot;, &quot;Bryan&quot;, &quot;Carla&quot;],
      &quot;City&quot;: &quot;Boston&quot;,
      &quot;State&quot;: &quot;MA&quot;
    }
`C`:

    {
      &quot;People&quot;: [&quot;Bryan&quot;, &quot;John&quot;],
      &quot;State&quot;: &quot;MA&quot;,
      &quot;City&quot;: &quot;Boston&quot;
    }

That would be:

    $ some_diff_command A.json B.json

    $ some_diff_command A.json C.json
    The files are not structurally identical


  [1]: http://stedolan.github.io/jq/

Using jq or alternative command line tools to compare JSON files

[This earlier question](https://stackoverflow.com/questions/19949526/examples-of-different-results-produced-by-the-standard-myers-minimal-patienc) asked for the differences between 4 different Git diff strategies, but the only difference that was explained was the difference between `myers` and `patience`, which is pretty well explained [elsewhere](http://alfedenzo.livejournal.com/170301.html).

How does the `histogram` strategy work? What differentiates it from `patience`? The [git-diff man page](https://www.kernel.org/pub/software/scm/git/docs/git-diff.html) only says that it &quot;extends the patience algorithm to &quot;support low-occurrence common elements&quot;.&quot; Other pages mention that it&#39;s faster, and that it comes from JGit, but they don&#39;t explain *where or how its algorithm or results will differ from `patience`*.

**Where can I find a description of the `histogram` algorithm relative to the `patience` algorithm**, with the same level of detail as [Bram Cohen&#39;s original description of the `patience` algorithm](http://bramcohen.livejournal.com/73318.html)?

(If it&#39;s just a matter of implementation performance with no case that will produce different results, why wasn&#39;t it just implemented as a new backend for `patience`?)

What&#39;s the difference between `git diff --patience` and `git diff --histogram`?

I need to compare two dataframes of different size row-wise and print out non matching rows. Lets take the following two:

    df1 = DataFrame({
    &#39;Buyer&#39;: [&#39;Carl&#39;, &#39;Carl&#39;, &#39;Carl&#39;],
    &#39;Quantity&#39;: [18, 3, 5, ]})

    df2 = DataFrame({
    &#39;Buyer&#39;: [&#39;Carl&#39;, &#39;Mark&#39;, &#39;Carl&#39;, &#39;Carl&#39;],
    &#39;Quantity&#39;: [2, 1, 18, 5]})

What is the most efficient way to row-wise over df2 and print out rows not in df1 e.g.

    Buyer     Quantity 
    Carl         2
    Mark         1

Important: I do not want to have row:
    
    Buyer     Quantity 
    Carl         3

Included in the diff:

I have already tried:
https://stackoverflow.com/questions/32972856/comparing-two-dataframes-of-different-length-row-by-row-and-adding-columns-for-e
and https://stackoverflow.com/questions/17095101/outputting-difference-in-two-pandas-dataframes-side-by-side-highlighting-the-d

But these do not match with my problem.


Diff of two Dataframes

I am comparing two text files and I get the following result:

    diff file1 file2 | grep 12345678

    &gt; 12345678
    &lt; 12345678

As you can see, the same string exists in both files, and both files were sorted with `sort`.

The line endings must be getting in the way here (Windows vs. Unix).

Is there a way to get `diff` to ignore line endings on Unix?






How can I ignore line endings when comparing files?

According to my knowledge:

- `PUT` - update object with its whole representation (replace)
- `PATCH` - update object with given fields only (update)

I&#39;m using Spring to implement a pretty simple HTTP server. When a user wants to update his data he needs to make a HTTP `PATCH` to some endpoint (let&#39;s say: `api/user`). His request body is mapped to a DTO via `@RequestBody`, which looks like this:

    class PatchUserRequest {
        @Email
        @Length(min = 5, max = 50)
        var email: String? = null
    
        @Length(max = 100)
        var name: String? = null
        ...
    }

Then I use an object of this class to update (patch) the user object:

    fun patchWithRequest(userRequest: PatchUserRequest) {
        if (!userRequest.email.isNullOrEmpty()) {
            email = userRequest.email!!
        }
        if (!userRequest.name.isNullOrEmpty()) {
            name = userRequest.name
        }    
        ...
    }

My doubt is: what if a client (web app for example) would like to clear a property? I would ignore such a change. 

**How can I know, if a user wanted to clear a property (he sent me null intentionally) or he just doesn&#39;t want to change it? It will be null in my object in both cases.**

I can see two options here:

- Agree with the client that if he wants to remove a property he should send me an empty string (but what about dates and other non-string types?)
- Stop using DTO mapping and use a simple map, which will let me check if a field was given empty or not given at all. What about request body validation then? I use `@Valid` right now.

How should such cases should be properly handled, in harmony with REST and all good practices?

**EDIT:**

One could say that `PATCH` shouldn&#39;t be used in such an example, and I should use `PUT` to update my User. But what about model changes (e.g. adding a new property)? I would have to version my API (or the user endpoint alone) after every User change. E.g. I would have `api/v1/user` endpoint which accepts `PUT` with an old request body, and `api/v2/user` endpoint which accepts `PUT` with a new request body. I guess it&#39;s not the solution and `PATCH` exists for a reason.

How to do PATCH properly in strongly typed languages based on Spring - example

I&#39;ve been trying to implement some unit tests for a module. An example module named *alphabet.py* is as follows:

    import database

    def length_letters():
        return len(letters)

    def contains_letter(letter):
        return True if letter in letters else False


    letters = database.get(&#39;letters&#39;)   # returns a list of letters


I&#39;d like to mock the response from a database with some values of my choice, but the code below doesn&#39;t seem to work.

    import unittests  
    import alphabet   
    from unittest.mock import patch   
      
      
    class TestAlphabet(unittest.TestCase): 
        @patch(&#39;alphabet.letters&#39;)
        def setUp(self, mock_letters):
            mock_letters.return_value = [&#39;a&#39;, &#39;b&#39;, &#39;c&#39;]   
      
        def test_length_letters(self):
            self.assertEqual(3, alphabet.length_letters())
          
        def test_contains_letter(self):   
            self.assertTrue(alphabet.contains_letter(&#39;a&#39;))


I have seen many examples in which &#39;patch&#39; is applied to methods and classes, but not to variables. I prefer not to patch the method *database.get* because I may use it again with different parameters later on, so I would need a different response.

What am I doing wrong here?

Mocking a global variable

I know it seems fairly redundant to have a title for a legend, but is it possible using matplotlib?

Here&#39;s a snippet of the code I have:

    import matplotlib.patches as mpatches
    import matplotlib.pyplot as plt

    one = mpatches.Patch(facecolor=&#39;#f3f300&#39;, label=&#39;label1&#39;, linewidth = 0.5, edgecolor = &#39;black&#39;)
    two = mpatches.Patch(facecolor=&#39;#ff9700&#39;, label = &#39;label2&#39;, linewidth = 0.5, edgecolor = &#39;black&#39;)
    three = mpatches.Patch(facecolor=&#39;#ff0000&#39;, label = &#39;label3&#39;, linewidth = 0.5, edgecolor = &#39;black&#39;)

    legend = plt.legend(handles=[one, two, three], loc = 4, fontsize = &#39;small&#39;, fancybox = True)

    frame = legend.get_frame() #sets up for color, edge, and transparency
    frame.set_facecolor(&#39;#b4aeae&#39;) #color of legend
    frame.set_edgecolor(&#39;black&#39;) #edge color of legend
    frame.set_alpha(1) #deals with transparency
    plt.show()

I would want the title of the legend above label1. For reference, this is the output:
[![Showing legend][1]][1]


  [1]: https://i.stack.imgur.com/qK0hz.png

Title for matplotlib legend

My question is rather simple, though I have had no luck finding an answer.

I&#39;d like to remove the leading plus/minus symbols from each line in `git diff`. Before you ask why I wish to do this, allow me to outline my reasons:

1. Lines that are exactly 80 chars will overflow by a single character, which just looks plain awkward
2. The coloring is enough for me to distinguish between additions/deletions
3. I&#39;d prefer to keep my Terminal&#39;s window width at 80 chars (as opposed to an arbitrary 81 chars) to maintain consistency with everything else I do in my Terminal (outside of `git`)

Is there some config option for doing this? If not, how can I do this in a way that still allows me to page through my diff `less`-style?

Any insight would be greatly appreciated.

Git: remove leading plus/minus from lines in diff

I have looked at various SO answers on using `git diff` and git revisions (HEAD, ORIG_HEAD, FETCH_HEAD, etc.) and I still haven&#39;t found an easy way to list the changes have been made since the beginning of the local branch, or since last rebase.

By _easy_ I mean without having to look up and paste commit SHA or having to count how many commits I want to look back.

`git diff origin/master` is close, but it refers to remote which may have diverged since I checked out new branch from it. 

I would expect something like `git diff BASE_HEAD` to be available.

...unless there&#39;s already a way to do that. Does anyone have the answer?

Is there a quick way to &quot;git diff&quot; from the point or branch origin?

When I do a [Github comparison view][1] between `master` and another branch `A`, Github seems to be comparing the HEAD version of `A` with an older, non head version of `master`.

I looked into it, and from what I can tell it sounds like Github is comparing branch `A` against a common ancestor of `master`. It&#39;s not actually comparing it to what&#39;s currently at the `HEAD` of master.

**Is there a way to diff the HEAD of master against the HEAD of Branch `A` in Github?**

If not, why not? This seems like a feature every developer would want to be able to do. Or is there some process that should be done that I&#39;m perhaps missing? I&#39;d like to be able to create a Pull Request directly from one of these diffs.

**EDIT:** Here&#39;s an example repo that shows the problem

https://github.com/bradparks/test_github_diff_view

- I created a new repo that contains a single file, README.md
- I set this file to contain a single line `v100`.
- I then branched master into a new branch `A`, and changed the line to `v200&#39;
- I then changed the value in the master branch to &#39;v300&#39;, and  then compared the 2 branches using the compare link

  https://github.com/bradparks/test_github_diff_view/compare/A
  
  and I see the following unexpected result. Why isn&#39;t it diffing against `v300` instead of `v100`?
  
  [![enter image description here][2]][2]
  

  [1]: https://help.github.com/articles/comparing-commits-across-time/
  [2]: http://i.stack.imgur.com/bnaxT.png


Github Comparison View for 2 branches is incorrect?

I staged a lot of files using `git add`, and now I want to see all the files I have staged, without *untracked* files or *changed, but unstaged* files.

How do I do that? When using `git diff --cached` I can see the changes of what I just staged. So then I tried using `git status --cached`, but that `--cached` unfortunately doesn&#39;t work on `git status`.




Content Type	Original Author	Original Content on Stackoverflow
Question	zatamine	View Question on Stackoverflow
Solution 1 - Git	Enrico Campidoglio	View Answer on Stackoverflow
Solution 2 - Git	kenorb	View Answer on Stackoverflow
Solution 3 - Git	user7396942	View Answer on Stackoverflow
Solution 4 - Git	Eugene	View Answer on Stackoverflow
Solution 5 - Git	Eugen Konkov	View Answer on Stackoverflow

Create patch or diff file from git repository and apply it to another different git repository

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Solution 3 - Git

Solution 4 - Git

Solution 5 - Git

My prerelease app has been "processing" for over a week in iTunes Connect, what gives?

Convert Dictionary to JSON in Swift

Attributions