Skip to content

Instantly share code, notes, and snippets.

@davidkhala

davidkhala/Git-Design.md

Last active February 26, 2021 05:13
Show Gist options
  • Save davidkhala/014d02a82cc9bf25bbcc48f58ca0239b to your computer and use it in GitHub Desktop.
Save davidkhala/014d02a82cc9bf25bbcc48f58ca0239b to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. davidkhala revised this gist Feb 26, 2021. 1 changed file with 2 additions and 0 deletions.
    2 changes: 2 additions & 0 deletions Git-Design.md
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,2 @@
    - Git in windows using `CRLF` for line-break and spaces
    - Git in Unix version it use `CL`, which will leads to lots of syntax error when running script
  2. davidkhala revised this gist Jan 11, 2021. 1 changed file with 6 additions and 2 deletions.
    8 changes: 6 additions & 2 deletions UseGit.md
    View file
    Original file line number Diff line number Diff line change
    @@ -1,7 +1,11 @@
    ### Apply git patch
    ## Apply git patch

    `git am <patch-file-path>`

    ### Resolve conflict if any
    ## Resolve conflict if any
    `git am -3`

    ## list modified files (including staged, excluding untracked)

    `!git status -s | cut -c1-3 --complement`

  3. davidkhala renamed this gist Jun 19, 2020. 1 changed file with 0 additions and 0 deletions.
    0 README.md → UseGit.md
    View file
    File renamed without changes.
  4. davidkhala created this gist Jun 19, 2020.
    7 changes: 7 additions & 0 deletions README.md
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,7 @@
    ### Apply git patch

    `git am <patch-file-path>`

    ### Resolve conflict if any
    `git am -3`