meta data for this page
  •  

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Next revision		Previous revision
git:patch [2016/02/22 09:38] – created niziakgit:patch [2020/06/03 11:16] (current) – niziak
Line 1: Line 1:
 +====== patch ======
 +
 +====== Applying ======
 +Check and apply the patch:
 +<code bash>
 +git apply --stat fix_empty_poster.patch
 +git apply --check fix_empty_poster.patch
 +git am --signoff < fix_empty_poster.patch
 +</code>
 +
 +====== Create ======
 +===== last commit =====
 +<code bash>git format-patch -1</code>
 +
 +===== current branch and master branch =====
 +<code bash>git format-patch gitlab/master --stdout</code>
 +
 === squash all commits === === squash all commits ===
 <code bash> <code bash>
Line 9: Line 26:
 <code bash> <code bash>
 git format-patch -M -s master git format-patch -M -s master
 +</code>
 +
 +This will generate patch files in the ''outgoing'' subdirectory, automatically adding the ''Signed-off-by'' line.
 +<code bash>
 +git format-patch -M -n -s -o outgoing origin/master
 </code> </code>