diff options
| -rw-r--r-- | fish.txt | 22 | ||||
| -rw-r--r-- | git.txt | 16 |
2 files changed, 38 insertions, 0 deletions
diff --git a/fish.txt b/fish.txt new file mode 100644 index 0000000..346df12 --- /dev/null +++ b/fish.txt @@ -0,0 +1,22 @@ +# fish-shell +------------------------------------------------------------------------------------------------------------------------ + +# toc + |keymaps| + |debug| + + - *keymaps* + Shift-Tab tab-completion with search + Alt-Up / Alt-Down search history with token under the cursor + Alt-l list content of dir under cursor + Alt-p append '2>&1 | less;' to current cmdline + + + - *debug* + status print-stack-trace prints function stacktrace (can be used in scripts) + breakpoint halt script execution and gives shell (C-d | exit to continue) + + +------------------------------------------------------------------------------------------------------------------------ +vim:ft=help:sts=2:et:tw=120:cc=120:fo+=t + @@ -8,7 +8,9 @@ |tags| |diff| |log| + |inspection| |patching| + |submodules| |revision_range| - *remote* @@ -51,6 +53,11 @@ git log --graph ............................. text based graph of commit history git log --decorate .......................... decorate log with REFs + - *inspection* + git ls-tree [-r] <ref> ...................... show git tree for <ref>, -r to recursively ls sub-trees + git show <obj> .............................. show <obj> + git cat-file -p <obj> ....................... print content of <obj> + - *patching* git format-patch <opt> <since>/<revision range> opt: @@ -73,6 +80,15 @@ # generate single patch file from a certain commit/ref git format-patch <COMMIT/REF> --stdout > my-patch.patch + - *submodules* + git submodule add <url> [<path>] ............ add new submodule to current project + git clone --recursive <url> ................. clone project and recursively all submodules (same as using + 'git submodule update --init --recursive' after clone) + git submodule update --init --recursive ..... checkout submodules recursively using the commit listed in the + super-project (in detached HEAD) + git submodule update --remote <submod> ...... fetch & merge remote changes for <submod>, this will pull + origin/HEAD or a branch specified for the submodule + - *revision_range* HEAD ........................................ last commit HEAD~1 ...................................... last commit-1 |