diff --git a/notes/cli/git.scrbl b/notes/cli/git.scrbl index 33d4ee6..ae88cf6 100644 --- a/notes/cli/git.scrbl +++ b/notes/cli/git.scrbl @@ -115,12 +115,9 @@ # --name-status option is a parameter for `git diff` and `git log`. # list modified files along with the type of modification: - # A: The file was added. - # M: The file was modified. - # D: The file was deleted. - # R: The file was renamed. - # C: The file was copied. - # U: The file is unmerged. You'll see this after a merge conflict. + # A: / M: / D: / R: / C: / U: + # The file was/is Added / Modified / Deleted / Renamed / Copied / Unmerged + # (After a merge conflict.) # list all files changed / touched in a particular commit # see diff --git a/notes/cli/linux.scrbl b/notes/cli/linux.scrbl index 6b10e15..50e1e40 100644 --- a/notes/cli/linux.scrbl +++ b/notes/cli/linux.scrbl @@ -758,7 +758,7 @@ curl --request POST -H 'Content-Type: application/json' -d '{"x":"1", "y":"2"}' URL curl --request POST --form variable=value URL - # :iproute2 :net - like ifconfig. State of network interfaces + # :iproute2 :network - like ifconfig. State of network interfaces ip address # show / manipulate routing, devices, policy routing and tunnels ip address show eth0 @@ -769,20 +769,20 @@ # Address Resolution Protocol table ip neighbour - # :net what is my IP address + # :network - what is my IP address? See also https://resolve.rs/ curl ifconfig.me - # See also - https://resolve.rs/ - - # recursively compare dirA with dirB; show only filenames: -q (quiet) - diff -rq dirA dirB | sort # sort via 2nd key (?column?) sort -k2 file.csv - # :diff outputs the files in two columns, side by side, separated by spaces + # diff / compare directories, show only filenames + # -q, --brief report only when files differ + # -r, --recursive + diff --brief --recursive dirA dirB --exclude '*.log' | sort + # + # outputs the files in two columns, side by side, separated by spaces sdiff file1 file0 - + # # output line-numbers diff --unchanged-line-format="" --old-line-format="" \ --new-line-format=":%dn: %L" oldfile newfile diff --git a/notes/cli/packaging.scrbl b/notes/cli/packaging.scrbl index 7dffd73..2aa3ff6 100644 --- a/notes/cli/packaging.scrbl +++ b/notes/cli/packaging.scrbl @@ -1,6 +1,5 @@ #lang notes - @block{@block-name{flatpak} # offers a sandbox to run applications in isolation @@ -19,6 +18,8 @@ # grant access permissions to a file / directory sudo flatpak override org.telegram.desktop --filesystem=~/Downloads sudo flatpak override org.telegram.desktop --nofilesystem=/some/path/here + + # installation directory: /var/lib/flatpak/app } @block{@block-name{snap}