mirror of https://github.com/CrimsonTome/tldr.git
pages*: convert long-short to short-long syntax (#13567)
* pages*: convert long-short to short-long syntax * git-add: fix typopull/28/head
parent
fb7d0ff4c6
commit
380fd5d441
|
@ -18,20 +18,20 @@
|
||||||
|
|
||||||
- Sorot baris tertentu dengan warna latar belakang yang berbeda:
|
- Sorot baris tertentu dengan warna latar belakang yang berbeda:
|
||||||
|
|
||||||
`bat {{--highlight-line|-H}} {{10|5:10|:10|10:|10:+5}} {{jalan/menuju/berkas}}`
|
`bat {{-H|--highlight-line}} {{10|5:10|:10|10:|10:+5}} {{jalan/menuju/berkas}}`
|
||||||
|
|
||||||
- Tunjukkan segala karakter yang tak tercetak seperti spasi, tab, atau indikator baris baru:
|
- Tunjukkan segala karakter yang tak tercetak seperti spasi, tab, atau indikator baris baru:
|
||||||
|
|
||||||
`bat {{--show-all|-A}} {{jalan/menuju/berkas}}`
|
`bat {{-A|--show-all}} {{jalan/menuju/berkas}}`
|
||||||
|
|
||||||
- Memberi nomor pada setiap baris keluaran:
|
- Memberi nomor pada setiap baris keluaran:
|
||||||
|
|
||||||
`bat {{--number|-n}} {{berkas}}`
|
`bat {{-n|--number}} {{berkas}}`
|
||||||
|
|
||||||
- Mencetak konten JSON dengan sintaks berwarna:
|
- Mencetak konten JSON dengan sintaks berwarna:
|
||||||
|
|
||||||
`bat {{--language|-l}} json {{jalan/menuju/berkas.json}}`
|
`bat {{-l|--language}} json {{jalan/menuju/berkas.json}}`
|
||||||
|
|
||||||
- Menampilkan semua bahasa yang didukung:
|
- Menampilkan semua bahasa yang didukung:
|
||||||
|
|
||||||
`bat {{--list-languages|-L}}`
|
`bat {{-L|--list-languages}}`
|
||||||
|
|
|
@ -18,20 +18,20 @@
|
||||||
|
|
||||||
- Highlight een specifieke regel of een reeks van regels met een andere achtergrondkleur:
|
- Highlight een specifieke regel of een reeks van regels met een andere achtergrondkleur:
|
||||||
|
|
||||||
`bat {{--highlight-line|-H}} {{10|5:10|:10|10:|10:+5}} {{pad/naar/bestand}}`
|
`bat {{-H|--highlight-line}} {{10|5:10|:10|10:|10:+5}} {{pad/naar/bestand}}`
|
||||||
|
|
||||||
- Toon niet-printbare karakters zoals spatie, tab of witregel:
|
- Toon niet-printbare karakters zoals spatie, tab of witregel:
|
||||||
|
|
||||||
`bat {{--show-all|-A}} {{pad/naar/bestand}}`
|
`bat {{-A|--show-all}} {{pad/naar/bestand}}`
|
||||||
|
|
||||||
- Nummer alle uitvoerregels:
|
- Nummer alle uitvoerregels:
|
||||||
|
|
||||||
`bat {{--number|-n}} {{pad/naar/bestand}}`
|
`bat {{-n|--number}} {{pad/naar/bestand}}`
|
||||||
|
|
||||||
- Highlight de syntax van een JSON-bestand:
|
- Highlight de syntax van een JSON-bestand:
|
||||||
|
|
||||||
`bat {{--language|-l}} json {{pad/naar/bestand.json}}`
|
`bat {{-l|--language}} json {{pad/naar/bestand.json}}`
|
||||||
|
|
||||||
- Toon alle ondersteunde talen:
|
- Toon alle ondersteunde talen:
|
||||||
|
|
||||||
`bat {{--list-languages|-L}}`
|
`bat {{-L|--list-languages}}`
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
- Volg eventuele `3xx` redirects en specificeer extra headers in een verzoek:
|
- Volg eventuele `3xx` redirects en specificeer extra headers in een verzoek:
|
||||||
|
|
||||||
`http {{--follow|-F}} {{https://example.com}} {{'User-Agent: Mozilla/5.0' 'Accept-Encoding: gzip'}}`
|
`http {{-F|--follow}} {{https://example.com}} {{'User-Agent: Mozilla/5.0' 'Accept-Encoding: gzip'}}`
|
||||||
|
|
||||||
- Authenticeer bij een server met verschillende authenticatiemethoden:
|
- Authenticeer bij een server met verschillende authenticatiemethoden:
|
||||||
|
|
||||||
|
|
|
@ -18,20 +18,20 @@
|
||||||
|
|
||||||
- Highlight a specific line or a range of lines with a different background color:
|
- Highlight a specific line or a range of lines with a different background color:
|
||||||
|
|
||||||
`bat {{--highlight-line|-H}} {{10|5:10|:10|10:|10:+5}} {{path/to/file}}`
|
`bat {{-H|--highlight-line}} {{10|5:10|:10|10:|10:+5}} {{path/to/file}}`
|
||||||
|
|
||||||
- Show non-printable characters like space, tab or newline:
|
- Show non-printable characters like space, tab or newline:
|
||||||
|
|
||||||
`bat {{--show-all|-A}} {{path/to/file}}`
|
`bat {{-A|--show-all}} {{path/to/file}}`
|
||||||
|
|
||||||
- Remove all decorations except line numbers in the output:
|
- Remove all decorations except line numbers in the output:
|
||||||
|
|
||||||
`bat {{--number|-n}} {{path/to/file}}`
|
`bat {{-n|--number}} {{path/to/file}}`
|
||||||
|
|
||||||
- Syntax highlight a JSON file by explicitly setting the language:
|
- Syntax highlight a JSON file by explicitly setting the language:
|
||||||
|
|
||||||
`bat {{--language|-l}} json {{path/to/file.json}}`
|
`bat {{-l|--language}} json {{path/to/file.json}}`
|
||||||
|
|
||||||
- Display all supported languages:
|
- Display all supported languages:
|
||||||
|
|
||||||
`bat {{--list-languages|-L}}`
|
`bat {{-L|--list-languages}}`
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
- Add all files (tracked and untracked):
|
- Add all files (tracked and untracked):
|
||||||
|
|
||||||
`git add {{--all|-A}}`
|
`git add {{-A|--all}}`
|
||||||
|
|
||||||
- Add all files in the current folder:
|
- Add all files in the current folder:
|
||||||
|
|
||||||
|
@ -17,20 +17,20 @@
|
||||||
|
|
||||||
- Only add already tracked files:
|
- Only add already tracked files:
|
||||||
|
|
||||||
`git add {{--update|-u}}`
|
`git add {{-u|--update}}`
|
||||||
|
|
||||||
- Also add ignored files:
|
- Also add ignored files:
|
||||||
|
|
||||||
`git add {{--force|-f}}`
|
`git add {{-f|--force}}`
|
||||||
|
|
||||||
- Interactively stage parts of files:
|
- Interactively stage parts of files:
|
||||||
|
|
||||||
`git add {{--patch|-p}}`
|
`git add {{-p|--patch}}`
|
||||||
|
|
||||||
- Interactively stage parts of a given file:
|
- Interactively stage parts of a given file:
|
||||||
|
|
||||||
`git add {{--patch|-p}} {{path/to/file}}`
|
`git add {{-p|--patch}} {{path/to/file}}`
|
||||||
|
|
||||||
- Interactively stage a file:
|
- Interactively stage a file:
|
||||||
|
|
||||||
`git add {{--interactive|-i}}`
|
`git add {{-i|--interactive}}`
|
||||||
|
|
|
@ -9,9 +9,9 @@
|
||||||
|
|
||||||
`git annotate {{path/to/file}}`
|
`git annotate {{path/to/file}}`
|
||||||
|
|
||||||
- Print a file with the author [e]mail and commit hash prepended to each line:
|
- Print a file with the author email and commit hash prepended to each line:
|
||||||
|
|
||||||
`git annotate {{--show-email|-e}} {{path/to/file}}`
|
`git annotate {{-e|--show-email}} {{path/to/file}}`
|
||||||
|
|
||||||
- Print only rows that match a regular expression:
|
- Print only rows that match a regular expression:
|
||||||
|
|
||||||
|
|
|
@ -5,24 +5,24 @@
|
||||||
|
|
||||||
- Create a tar archive from the contents of the current HEAD and print it to `stdout`:
|
- Create a tar archive from the contents of the current HEAD and print it to `stdout`:
|
||||||
|
|
||||||
`git archive {{--verbose|-v}} HEAD`
|
`git archive {{-v|--verbose}} HEAD`
|
||||||
|
|
||||||
- Use the Zip format and report progress verbosely:
|
- Use the Zip format and report progress verbosely:
|
||||||
|
|
||||||
`git archive {{--verbose|-v}} --format zip HEAD`
|
`git archive {{-v|--verbose}} --format zip HEAD`
|
||||||
|
|
||||||
- Output the Zip archive to a specific file:
|
- Output the Zip archive to a specific file:
|
||||||
|
|
||||||
`git archive {{--verbose|-v}} {{--output|-o}} {{path/to/file.zip}} HEAD`
|
`git archive {{-v|--verbose}} {{-o|--output}} {{path/to/file.zip}} HEAD`
|
||||||
|
|
||||||
- Create a tar archive from the contents of the latest commit of a specific branch:
|
- Create a tar archive from the contents of the latest commit of a specific branch:
|
||||||
|
|
||||||
`git archive {{--output|-o}} {{path/to/file.tar}} {{branch_name}}`
|
`git archive {{-o|--output}} {{path/to/file.tar}} {{branch_name}}`
|
||||||
|
|
||||||
- Use the contents of a specific directory:
|
- Use the contents of a specific directory:
|
||||||
|
|
||||||
`git archive {{--output|-o}} {{path/to/file.tar}} HEAD:{{path/to/directory}}`
|
`git archive {{-o|--output}} {{path/to/file.tar}} HEAD:{{path/to/directory}}`
|
||||||
|
|
||||||
- Prepend a path to each file to archive it inside a specific directory:
|
- Prepend a path to each file to archive it inside a specific directory:
|
||||||
|
|
||||||
`git archive {{--output|-o}} {{path/to/file.tar}} --prefix {{path/to/prepend}}/ HEAD`
|
`git archive {{-o|--output}} {{path/to/file.tar}} --prefix {{path/to/prepend}}/ HEAD`
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
- Print file with author email and commit hash on each line:
|
- Print file with author email and commit hash on each line:
|
||||||
|
|
||||||
`git blame {{--show-email|-e}} {{path/to/file}}`
|
`git blame {{-e|--show-email}} {{path/to/file}}`
|
||||||
|
|
||||||
- Print file with author name and commit hash on each line at a specific commit:
|
- Print file with author name and commit hash on each line at a specific commit:
|
||||||
|
|
||||||
|
|
|
@ -25,11 +25,11 @@
|
||||||
|
|
||||||
- Rename a branch (must not have it checked out to do this):
|
- Rename a branch (must not have it checked out to do this):
|
||||||
|
|
||||||
`git branch {{--move|-m}} {{old_branch_name}} {{new_branch_name}}`
|
`git branch {{-m|--move}} {{old_branch_name}} {{new_branch_name}}`
|
||||||
|
|
||||||
- Delete a local branch (must not have it checked out to do this):
|
- Delete a local branch (must not have it checked out to do this):
|
||||||
|
|
||||||
`git branch {{--delete|-d}} {{branch_name}}`
|
`git branch {{-d|--delete}} {{branch_name}}`
|
||||||
|
|
||||||
- Delete a remote branch:
|
- Delete a remote branch:
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
- Show commits (and their messages) with equivalent commits upstream:
|
- Show commits (and their messages) with equivalent commits upstream:
|
||||||
|
|
||||||
`git cherry {{--verbose|-v}}`
|
`git cherry {{-v|--verbose}}`
|
||||||
|
|
||||||
- Specify a different upstream and topic branch:
|
- Specify a different upstream and topic branch:
|
||||||
|
|
||||||
|
|
|
@ -7,9 +7,9 @@
|
||||||
|
|
||||||
`git clean`
|
`git clean`
|
||||||
|
|
||||||
- [i]nteractively delete untracked files:
|
- Interactively delete untracked files:
|
||||||
|
|
||||||
`git clean {{--interactive|-i}}`
|
`git clean {{-i|--interactive}}`
|
||||||
|
|
||||||
- Show which files would be deleted without actually deleting them:
|
- Show which files would be deleted without actually deleting them:
|
||||||
|
|
||||||
|
@ -17,11 +17,11 @@
|
||||||
|
|
||||||
- Forcefully delete untracked files:
|
- Forcefully delete untracked files:
|
||||||
|
|
||||||
`git clean {{--force|-f}}`
|
`git clean {{-f|--force}}`
|
||||||
|
|
||||||
- Forcefully delete untracked [d]irectories:
|
- Forcefully delete untracked [d]irectories:
|
||||||
|
|
||||||
`git clean {{--force|-f}} -d`
|
`git clean {{-f|--force}} -d`
|
||||||
|
|
||||||
- Delete untracked files, including e[x]cluded files (files ignored in `.gitignore` and `.git/info/exclude`):
|
- Delete untracked files, including e[x]cluded files (files ignored in `.gitignore` and `.git/info/exclude`):
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
|
|
||||||
- Display changes in patch format:
|
- Display changes in patch format:
|
||||||
|
|
||||||
`git diff-tree {{--patch|-p}} {{tree-ish1}} {{tree-ish2}}`
|
`git diff-tree {{-p|--patch}} {{tree-ish1}} {{tree-ish2}}`
|
||||||
|
|
||||||
- Filter changes by a specific path:
|
- Filter changes by a specific path:
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
|
|
||||||
- Change the Git LFS endpoint URL (useful if the LFS server is separate from the Git server):
|
- Change the Git LFS endpoint URL (useful if the LFS server is separate from the Git server):
|
||||||
|
|
||||||
`git config {{--file|-f}} .lfsconfig lfs.url {{lfs_endpoint_url}}`
|
`git config {{-f|--file}} .lfsconfig lfs.url {{lfs_endpoint_url}}`
|
||||||
|
|
||||||
- List tracked patterns:
|
- List tracked patterns:
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
- Show only commits with messages that include a specific string, ignoring case:
|
- Show only commits with messages that include a specific string, ignoring case:
|
||||||
|
|
||||||
`git log {{--regexp-ignore-case|-i}} --grep {{search_string}}`
|
`git log {{-i|--regexp-ignore-case}} --grep {{search_string}}`
|
||||||
|
|
||||||
- Show the last N number of commits from a certain author:
|
- Show the last N number of commits from a certain author:
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
- Start an interactive rebase, which allows the commits to be reordered, omitted, combined or modified:
|
- Start an interactive rebase, which allows the commits to be reordered, omitted, combined or modified:
|
||||||
|
|
||||||
`git rebase {{--interactive|-i}} {{target_base_branch_or_commit_hash}}`
|
`git rebase {{-i|--interactive}} {{target_base_branch_or_commit_hash}}`
|
||||||
|
|
||||||
- Continue a rebase that was interrupted by a merge failure, after editing conflicting files:
|
- Continue a rebase that was interrupted by a merge failure, after editing conflicting files:
|
||||||
|
|
||||||
|
@ -30,8 +30,8 @@
|
||||||
|
|
||||||
- Reapply the last 5 commits in-place, stopping to allow them to be reordered, omitted, combined or modified:
|
- Reapply the last 5 commits in-place, stopping to allow them to be reordered, omitted, combined or modified:
|
||||||
|
|
||||||
`git rebase {{--interactive|-i}} {{HEAD~5}}`
|
`git rebase {{-i|--interactive}} {{HEAD~5}}`
|
||||||
|
|
||||||
- Auto-resolve any conflicts by favoring the working branch version (`theirs` keyword has reversed meaning in this case):
|
- Auto-resolve any conflicts by favoring the working branch version (`theirs` keyword has reversed meaning in this case):
|
||||||
|
|
||||||
`git rebase {{--strategy-option|-X}} theirs {{branch_name}}`
|
`git rebase {{-X|--strategy-option}} theirs {{branch_name}}`
|
||||||
|
|
|
@ -13,4 +13,4 @@
|
||||||
|
|
||||||
- Show only the 5 latest entries in the reflog:
|
- Show only the 5 latest entries in the reflog:
|
||||||
|
|
||||||
`git reflog {{--dry-run|-n}} {{5}}`
|
`git reflog {{-n|--dry-run}} {{5}}`
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
- List existing remotes with their names and URLs:
|
- List existing remotes with their names and URLs:
|
||||||
|
|
||||||
`git remote {{--verbose|-v}}`
|
`git remote {{-v|--verbose}}`
|
||||||
|
|
||||||
- Show information about a remote:
|
- Show information about a remote:
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
- Print the latest commit that changed (add/edit/remove) a specific file on the current branch:
|
- Print the latest commit that changed (add/edit/remove) a specific file on the current branch:
|
||||||
|
|
||||||
`git rev-list {{--max-count|-n}} 1 HEAD -- {{path/to/file}}`
|
`git rev-list {{-n|--max-count}} 1 HEAD -- {{path/to/file}}`
|
||||||
|
|
||||||
- List commits more recent than a specific date, on a specific branch:
|
- List commits more recent than a specific date, on a specific branch:
|
||||||
|
|
||||||
|
|
|
@ -21,4 +21,4 @@
|
||||||
|
|
||||||
- Don't create new commits, just change the working tree:
|
- Don't create new commits, just change the working tree:
|
||||||
|
|
||||||
`git revert {{--no-commit|-n}} {{0c01a9..9a1743}}`
|
`git revert {{-n|--no-commit}} {{0c01a9..9a1743}}`
|
||||||
|
|
|
@ -9,11 +9,11 @@
|
||||||
|
|
||||||
- View a summary of all the commits made, sorted by the number of commits made:
|
- View a summary of all the commits made, sorted by the number of commits made:
|
||||||
|
|
||||||
`git shortlog {{--numbered|-n}}`
|
`git shortlog {{-n|--numbered}}`
|
||||||
|
|
||||||
- View a summary of all the commits made, grouped by the committer identities (name and email):
|
- View a summary of all the commits made, grouped by the committer identities (name and email):
|
||||||
|
|
||||||
`git shortlog {{--committer|-c}}`
|
`git shortlog {{-c|--committer}}`
|
||||||
|
|
||||||
- View a summary of the last 5 commits (i.e. specify a revision range):
|
- View a summary of the last 5 commits (i.e. specify a revision range):
|
||||||
|
|
||||||
|
@ -21,8 +21,8 @@
|
||||||
|
|
||||||
- View all users, emails and the number of commits in the current branch:
|
- View all users, emails and the number of commits in the current branch:
|
||||||
|
|
||||||
`git shortlog {{--summary|-s}} {{--numbered|-n}} {{--email|-e}}`
|
`git shortlog {{-s|--summary}} {{-n|--numbered}} {{-e|--email}}`
|
||||||
|
|
||||||
- View all users, emails and the number of commits in all branches:
|
- View all users, emails and the number of commits in all branches:
|
||||||
|
|
||||||
`git shortlog {{--summary|-s}} {{--numbered|-n}} {{--email|-e}} --all`
|
`git shortlog {{-s|--summary}} {{-n|--numbered}} {{-e|--email}} --all`
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
- Clone an SVN repository starting at a given revision number:
|
- Clone an SVN repository starting at a given revision number:
|
||||||
|
|
||||||
`git svn clone {{--revision|-r}} {{1234}}:HEAD {{https://svn.example.net/subversion/repo}} {{local_dir}}`
|
`git svn clone {{-r|--revision}} {{1234}}:HEAD {{https://svn.example.net/subversion/repo}} {{local_dir}}`
|
||||||
|
|
||||||
- Update local clone from the remote SVN repository:
|
- Update local clone from the remote SVN repository:
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
- Delete the tag with the given name:
|
- Delete the tag with the given name:
|
||||||
|
|
||||||
`git tag {{--delete|-d}} {{tag_name}}`
|
`git tag {{-d|--delete}} {{tag_name}}`
|
||||||
|
|
||||||
- Get updated tags from remote:
|
- Get updated tags from remote:
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
- Follow any `3xx` redirects and specify additional headers in a request:
|
- Follow any `3xx` redirects and specify additional headers in a request:
|
||||||
|
|
||||||
`http {{--follow|-F}} {{https://example.com}} {{'User-Agent: Mozilla/5.0' 'Accept-Encoding: gzip'}}`
|
`http {{-F|--follow}} {{https://example.com}} {{'User-Agent: Mozilla/5.0' 'Accept-Encoding: gzip'}}`
|
||||||
|
|
||||||
- Authenticate to a server using different authentication methods:
|
- Authenticate to a server using different authentication methods:
|
||||||
|
|
||||||
|
|
|
@ -10,11 +10,11 @@
|
||||||
|
|
||||||
- Start `mitmproxy` bound to a custom address and port:
|
- Start `mitmproxy` bound to a custom address and port:
|
||||||
|
|
||||||
`mitmproxy --listen-host {{ip_address}} {{--listen-port|-p}} {{port}}`
|
`mitmproxy --listen-host {{ip_address}} {{-p|--listen-port}} {{port}}`
|
||||||
|
|
||||||
- Start `mitmproxy` using a script to process traffic:
|
- Start `mitmproxy` using a script to process traffic:
|
||||||
|
|
||||||
`mitmproxy {{--scripts|-s}} {{path/to/script.py}}`
|
`mitmproxy {{-s|--scripts}} {{path/to/script.py}}`
|
||||||
|
|
||||||
- Export the logs with SSL/TLS master keys to external programs (wireshark, etc.):
|
- Export the logs with SSL/TLS master keys to external programs (wireshark, etc.):
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
- Specify mode of operation of the proxy server (`regular` is the default):
|
- Specify mode of operation of the proxy server (`regular` is the default):
|
||||||
|
|
||||||
`mitmproxy {{--mode|-m}} {{regular|transparent|socks5|...}}`
|
`mitmproxy {{-m|--mode}} {{regular|transparent|socks5|...}}`
|
||||||
|
|
||||||
- Set the console layout:
|
- Set the console layout:
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue