Note that there are some explanatory texts on larger screens.

plurals
  1. POgit create patch with diff
    primarykey
    data
    text
    <p>I tried doing </p> <pre><code>git diff 13.1_dev sale_edit &gt; patch.diff </code></pre> <p>Then I tried doing <code>git apply patch.diff</code> in another branch, but I got patch does not apply. How do I create patch files from diffs that I can use with git apply?</p> <p>Errors received:</p> <pre><code>$ git apply --ignore-space-change --ignore-whitespace diff.diff diff.diff:9: trailing whitespace. diff.diff:10: trailing whitespace. function set_change_sale_date() diff.diff:12: space before tab in indent. $this-&gt;sale_lib-&gt;set_change_sale_date($this-&gt;input-&gt;post('change_sale_date')); diff.diff:14: trailing whitespace. diff.diff:15: trailing whitespace. function set_change_sale_date_enable() warning: application/controllers/sales.php has type 100755, expected 100644 error: patch failed: application/controllers/sales.php:520 error: application/controllers/sales.php: patch does not apply warning: application/language/english/sales_lang.php has type 100755, expected 100644 error: patch failed: application/language/english/sales_lang.php:134 error: application/language/english/sales_lang.php: patch does not apply warning: application/libraries/Sale_lib.php has type 100755, expected 100644 error: patch failed: application/models/sale.php:170 error: application/models/sale.php: patch does not apply warning: application/views/sales/register.php has type 100755, expected 100644 error: patch failed: application/views/sales/register.php:361 error: application/views/sales/register.php: patch does not apply </code></pre> <p>I'm trying this on Mac</p>
    singulars
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
 

Querying!

 
Guidance

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload