From 2413e9cbad620ca20b3aaffeb9cf4bb132e6113f Mon Sep 17 00:00:00 2001 From: johannst Date: Thu, 20 Feb 2025 23:05:55 +0000 Subject: deploy: 8167ecb83a8cc75da42a0b398c750d8f3aa4c44b --- print.html | 169 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 147 insertions(+), 22 deletions(-) (limited to 'print.html') diff --git a/print.html b/print.html index 21ef4ac..b3b3e20 100644 --- a/print.html +++ b/print.html @@ -999,6 +999,8 @@ status -f # abs path of current file
  • rev
  • paste
  • xargs
    • +
  • grep
    • +
  • find

    • awk(1)

    awk [opt] program [input]
@@ -1423,6 +1425,55 @@ eval strace -f (find /dev -name 'std*' | xargs -I {} echo -P {}) ls
 # Both commands achieve the same thing and result in something like:
 #   eval strace -f -P /dev/stdin -P /dev/stdout -P /dev/stderr ls
    +

    grep(1)

    +
    sort [opts] [pattern] [files]
+    -e <pattern>        pattern to search for (can be supplied multiple times)
+    -i                  ignore case in patterns
+    -v                  invert match
+
+    -n                  add line numbers to matched lines
+    -H                  add file name to matched lines
+
+    -r                  recursively read all files
+    -I                  skip binary files
+    --include <glob>    search only files matching glob
+    --exclude <glob>    skip searching files matching glob
+
+    -c                  count occurrence of matched patterns
+    -l                  list only file name which contain the pattern
+
    +
    +

    <glob> patterns may need to be quoted or escaped if the shell also does glob expansion.

    +
    +

    find(1)

    +
    find <start> [opts]
+    -maxdepth <n>        maximally search n dirs deep
+    -type <t>            match on file type
+                           f    regular file
+                           d    directory
+    -user <name>         list files owned by username
+    -name <glob>         list files matching glob (only filename)
+    -iname <glob>        list files matching glob case-insensitive
+
+    -exec <cmd> {} ;     run cmd on each file
+    -exec <cmd> {} +     run cmd with all files as argument
+
    +
    +

    Depending on the shell the <glob> must be quoted or escaped. The +exec modifier characters ; and + also may need to be escaped.

    +
    +

    Example -exec option

    +
    > find . -maxdepth 1 -type d -exec echo x {} \;
+# x .
+# x ./.github
+# x ./book
+# x ./src
+# x ./.git
+# x ./docs
+
+> find . -maxdepth 1 -type d -exec echo x {} +
+# x . ./.github ./book ./src ./.git ./docs
+

    Tools

    qrencode(1)

    +
    qrencode
+    -s N     pixels per feature length
+

    Generate wifi qr code for WPA2 secured network.

    # Generate on terminal.
 qrencode -t ansiutf8 'WIFI:S:<wifiname>;T:WPA2;P:<wifipasswd>;;'
@@ -4854,13 +4946,15 @@ run1:
 
    Working areas
    
 
    +-------------------+ --- stash -----> +-------+
 | working directory |                  | stash |  // Shelving area.
-+-------------------+ <-- stash pop -- +-------+
+|     (worktree)    | <-- stash pop -- +-------+
++-------------------+
       |       ^
      add      |
       |     reset
       v       |
 +-------------------+
 |   staging area    |
+|      (index)      |
 +-------------------+
       |
     commit
@@ -4925,7 +5019,7 @@ run1:
                                        on-top of remote branch (in case local
                                        branch has additional commits compared to remote branch).
 
    
-
    Tags
    
+
    Tags
    
 
      git tag -a <tname> -m "descr" ........ creates an annotated tag (full object
                                          containing tagger, date, ...)
   git tag -l ........................... list available tags
@@ -5019,8 +5113,39 @@ the same repository (shared .git folder).
    
                                    tracked files in the working tree since
                                    <commit> are lost
   git reset HEAD <file> .......... remove file from staging
-  git reset --soft HEAD~1 ........ delete most recent commit but keep work
-  git reset --hard HEAD~1 ........ delete most recent commit and delete work
+  git reset --soft HEAD~1 ........ delete most recent commit; dont revert index & worktree
+  git reset --mixed HEAD~1 ....... delete most recent commit; revert index; dont revert worktree
+  git reset --hard HEAD~1 ........ delete most recent commit; revert index & worktree
+
    
+
    Assuming an initial history A - B - C - D where HEAD currently points at
+D, the different reset operations work as shown below.
    
+
    Soft reset.
    
+
    git reset --soft HEAD~2
+
+history:    A - B
+                ^HEAD
+
+-> local history is reverted, HEAD moved to B.
+-> changes from C + D are still in the worktree & index (appear as staged changes).
+
    
+
    Mixed reset.
    
+
    git reset --mixed HEAD~2
+
+history:    A - B
+                ^HEAD
+
+-> local history is reverted, HEAD moved to B.
+-> changed from C + D are reverted in the index.
+-> changes from C + D are still in the worktree (appear as unstaged changes).
+
    
+
    Hard reset.
    
+
    git reset --head HEAD~2
+
+history:    A - B
+                ^HEAD
+
+-> local history is reverted, HEAD moved to B.
+-> changes from C + D also reverted in the worktree & index (no pending changes).
 
    
 
    Submodules
    
 
      git submodule add <url> [<path>] .......... add new submodule to current project
-- 
cgit v1.2.3