Both the input and output are different:

* [`git apply`](https://git-scm.com/docs/git-apply) takes a patch (e.g. the output of [`git diff`](https://git-scm.com/docs/git-diff)) and applies it to the working directory (or index, if `--index` or `--cached` is used).
* [`git am`](https://git-scm.com/docs/git-am) takes a mailbox of commits formatted as an email messages (e.g. the output of [`git format-patch`](https://git-scm.com/docs/format-patch)) and applies them to the current branch.

[`git am` uses `git apply` behind the scenes](https://github.com/git/git/blob/bbcefff/git-am.sh#L151), but does more work before (reading a `Maildir` or `mbox`, and parsing email messages) and after (creating commits).

`git apply` is for applying straight diffs (e.g. from `git diff`) whereas `git am` is for applying patches and sequences of patches from emails, either mbox or Maildir format and is the &quot;opposite&quot; of `git format-patch`. `git am` tries to extract commit messages and author details from email messages which is why it can make commits.

With `git am` you apply the patch so when you run `git status` you won&#39;t see any local changes, but `git log` will show the patch have been committed to the source code.

But with `git apply` you make the changes in the source files as if you were writing the code yourself, consequently `git status` and `git diff` will output the changes appeared in the patch you applied. Hence with `git apply` you can fix/add more changes and `git add` them together as a single new patch.

Assume I have a pandas DataFrame with two columns, A and B. I&#39;d like to modify this DataFrame (or create a copy) so that B is always NaN whenever A is 0. How would I achieve that?

I tried the following

    df[&#39;A&#39;==0][&#39;B&#39;] = np.nan

and

    df[&#39;A&#39;==0][&#39;B&#39;].values.fill(np.nan)

without success.


Modifying a subset of rows in a pandas dataframe

I&#39;m so lost and new to building NGINX on my own but I want to be able to enable secure websockets without having an additional layer.

I don&#39;t want to enable SSL on the websocket server itself but instead I want to use NGINX to add an SSL layer to the whole thing. 

Every web page out there says I can&#39;t do it, but I know I can! Thanks to whoever (myself) can show me how!

NGINX to reverse proxy websockets AND enable SSL (wss://)?

Both `git am` and `git apply` can be used to apply patches. I fail to see the difference. I see a difference now: `git am` automatically commits whereas `git apply` only touches the files but doesn&#39;t create a commit. Is that the only difference?

What is the difference between git am and git apply?

<p>Both <code>git am</code> and <code>git apply</code> can be used to apply patches. I fail to see the difference. I see a difference now: <code>git am</code> automatically commits whereas <code>git apply</code> only touches the files but doesn't create a commit. Is that the only difference?</p>


I&#39;d like to show all configured Git sections.

I only found `git config --get core.editor`, and I&#39;d like to output everything that&#39;s configured globally, not only the configured default editor.


How do I show my global Git configuration?

I have an Amazon EC2 machine. I would like to clone an older version of github repo on this machine. Normally I use git clone https://linktomyrepo.git How can I clone an older version, say an update from 14 days ago? I can see the exact version I need in the commit history of repository, but do not know how to clone it onto the EC2 machine. Do I need to use the little SHA code next to each commit?

Cloning an older version of github repo

I have a Git repository. I have cloned the repository and can commit my local changes. When I push my changes to the server it works.

As soon as I create a branch, I checkout the branch, commit my work and then checkout the master branch. I then merge my local changes into the master branch. When I try to push to the server I get the following exception:

    Welcome to Git (version 1.7.11-preview20120620)

    Run &#39;git help git&#39; to display the help index.
    Run &#39;git help &lt;command&gt;&#39; to display help for specific commands.

    $ git push origin master:master
     Counting objects: 9, done.
     Delta compression using up to 4 threads.
     Compressing objects: 100% (7/7), done.
     Writing objects: 100% (8/8), 13.68 KiB, done.
     Total 8 (delta 2), reused 1 (delta 0)
     Unpacking objects: 100% (8/8), done.
     remote: error: refusing to update checked out branch: refs/heads/master
     remote: error: By default, updating the current branch in a non-bare repository
     remote: error: is denied, because it will make the index and work tree inconsistent
     remote: error: with what you pushed, and will require &#39;git reset --hard&#39; to match
     remote: error: the work tree to HEAD.
     remote: error:
     remote: error: You can set &#39;receive.denyCurrentBranch&#39; configuration variable to

     remote: error: &#39;ignore&#39; or &#39;warn&#39; in the remote repository to allow pushing into

     remote: error: its current branch; however, this is not recommended unless you
     remote: error: arranged to update its work tree to match what you pushed in some

     remote: error: other way.
     remote: error:
     remote: error: To squelch this message and still keep the default behaviour, set

     remote: error: &#39;receive.denyCurrentBranch&#39; configuration variable to &#39;refuse&#39;.
     To c:/jGit
     ! [remote rejected] master -&gt; master (branch is currently checked out)
     error: failed to push some refs to &#39;c:/gitRepository&#39;

One solution is to run the following command:

    git config receive.denyCurrentBranch ignore

**After this it works, but I would like to know why I need to use this option. Is this the only option? What are the consequences of doing this?**

What I would really like to do is create branches, merge them into the master branch and then push my changes to the server.

What are the consequences of using receive.denyCurrentBranch in Git?

I&#39;m trying to initialize a new Git repository from [Debian][1] (actually a VM on VirtualBox, installed and running on Mac&amp;nbsp;OS&amp;nbsp;X):

    cd ~
    mkdir test
    cd test
    git init

    Initialized empty Git repository in /home/david/test/.git/
    fatal: ambiguous argument &#39;HEAD&#39;: unknown revision or path not in the working tree.
    Use &#39;--&#39; to separate paths from revisions

    [david@server-VM-001:test  (master #) $]

What&#39;s the problem?

  [1]: https://en.wikipedia.org/wiki/Debian






Git error &quot;fatal: ambiguous argument &#39;HEAD&#39;: unknown revision or path not in the working tree&quot;

I have a Git repository with many branches, some of them already merged and some not. Since the number of branches is quite large, how can I determine which branches have not yet been merged? I would like to avoid having to do an &quot;octopus&quot; merge and re-merging branches that have already been merged.

Find unmerged Git branches?

I&#39;m editing some markdown files of a cloned remote repository, and wanted to test creating and applying patches from one branch to another. However, every time I make any change at all, I get the following message during `git apply`:

    0001-b.patch:16: trailing whitespace.
    warning: 1 line adds whitespace errors.

(This is happening on my Mac, and I don&#39;t know where the original code was created.)

What does the warning message mean, and do I need to care?



What does &quot;1 line adds whitespace errors&quot; mean when applying a patch?

I have to make a PATCH request using PhP cURL. I couldn&#39;t find any documentation, so I tried the following but it isn&#39;t working.
 
    $data = &quot;{&#39;field_name&#39;: &#39;field_value&#39;}&quot;;
    $url = &quot;http://webservice.url&quot;;
    $headers = array(&#39;X-HTTP-Method-Override: PATCH&#39;);
    $curl = curl_init();
    curl_setopt($curl, CURLOPT_URL, $url);
    curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
    curl_setopt($curl, CURLOPT_POST, 1);
    curl_setopt($curl, CURLOPT_POSTFIELDS, $data);
    curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
    $response = curl_exec($curl);
    curl_close($curl);
 
Any idea why this isn&#39;t working? How can I fix it?

**Edit:**
I am connecting to a RESTful web service. It returns HTTP/1.1 200 for successful requests. Unsuccessful requests return HTTP/1.1 403. I keep getting 403.

I tried changing $data to:
 
    $data = &quot;data={&#39;field_name&#39;: &#39;field_value&#39;}&quot;;
It didn&#39;t change the outcome. 

**Edit2:**
The final working code.
 

    $data = &quot;{&#39;field_name&#39;: &#39;field_value&#39;}&quot;;
    $url = &quot;http://webservice.url&quot;;
    $headers = array(&#39;Content-Type: application/json&#39;);
    $curl = curl_init();
    curl_setopt($curl, CURLOPT_URL, $url);
    curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
    curl_setopt($curl, CURLOPT_CUSTOMREQUEST, &#39;PATCH&#39;);
    curl_setopt($curl, CURLOPT_POSTFIELDS, $data);
    curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
    $response = curl_exec($curl);
    curl_close($curl);


How do I make a PATCH request in PHP using cURL?

I am trying to make a PATCH call to a server. I am using the following command: 

    curl --data status=closed -X PATCH https://api.viafoura.com/v2/dev.viafoura.com/pages/7000000043515 

Is this the correct way of sending the PATCH request? I am getting an error saying there is no status parameter set. I am guessing the --data is for POST request only and thus the server doesn&#39;t find the status parameter.

This is the response (FYI):

    {&quot;http_status&quot;:400,&quot;error&quot;:&quot;Parameter validation errors&quot;,&quot;validation_errors&quot;:{&quot;status&quot;:{&quot;error&quot;:&quot;Request missing status parameter.&quot;}}}

You can find documentation about this service [here][1].


  [1]: http://developers.viafoura.com/rest_api_v2.php#modify_a_page

How to use PATCH verb with curl

I have two repositories. In one, I make changes to file `./hello.test`. I commit the changes and create a patch from that commit with `git format-patch -1 HEAD`. Now, I have a second repository that contains a file that has the same contents as hello.test but is placed in a different directory under a different name: `./blue/red/hi.test`. How do I go about applying the aforementioned patch to the `hi.test` file? I tried `git am --directory=&#39;blue/red&#39; &lt; patch_file` but that of course complains that the files are not named the same (which I thought Git didn&#39;t care about?). I know I could probably edit the diff to apply to that specific file but I&#39;m looking for a command solution.

How to apply a Git patch to a file with a different name and path?

Is it possible to mock a return value of a function called within another function I am trying to test? I would like the mocked method (which will be called in many methods I&#39;m testing) to returned my specified variables each time it is called. For example: 

    class Foo:
        def method_1():
           results = uses_some_other_method()
        def method_n():
           results = uses_some_other_method()

In the unit test, I would like to use mock to change the return value of `uses_some_other_method()` so that any time it is called in `Foo`, it will return what I defined in `@patch.object(...)`

Content Type	Original Author	Original Content on Stackoverflow
Question	Christoph	View Question on Stackoverflow
Solution 1 - Git	georgebrock	View Answer on Stackoverflow
Solution 2 - Git	CB Bailey	View Answer on Stackoverflow
Solution 3 - Git	0x90	View Answer on Stackoverflow

What is the difference between git am and git apply?

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Solution 3 - Git

NGINX to reverse proxy websockets AND enable SSL (wss://)?

Modifying a subset of rows in a pandas dataframe

Attributions