elmahdim/gitgit.md

Last active December 15, 2016 08:15

Star (0) You must be signed in to star a gist
Fork (0) You must be signed in to fork a gist

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/elmahdim/4b5ad878dd5d04aa0f539b4d5d7262c3.js"></script>
Save elmahdim/4b5ad878dd5d04aa0f539b4d5d7262c3 to your computer and use it in GitHub Desktop.

Download ZIP

Useful git commands

Raw

gitgit.md

git show --name-only

commit b1e64c630129b47cb0ff1fcbed8b7cee10857000
Merge: 0fbfdab 8bb6266
Author: x_x <[email protected]>
Date:   Thu Nov 24 17:20:31 2016 +0300

    fix conflict

module/Admin/view/layout/admin.phtml

git diff --name-only --diff-filter=U

composer.lock

git diff -U0

diff --git a/path/to/file.php b/path/to/file.php
index bf2f984..395ee28 100644
--- a/path/to/file.php
+++ b/path/to/file.php
@@ -27 +27 @@
-      <li>data</li>
+      <li>Data</li>
@@ -111 +111 @@
-  <a href="">payment method</a>
+  <a href="">payout method</a>
(END)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment