From 0490d53661ee6f1014f7959cd9602199a59ffda6 Mon Sep 17 00:00:00 2001 From: "Rico Sta. Cruz" Date: Wed, 30 Aug 2017 00:57:42 +0800 Subject: [PATCH] Update tig --- elixir.md | 1 + tig.md | 87 ++++++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 65 insertions(+), 23 deletions(-) diff --git a/elixir.md b/elixir.md index 2f34fc4d9..3509bed9b 100644 --- a/elixir.md +++ b/elixir.md @@ -4,6 +4,7 @@ category: Elixir layout: 2017/sheet tags: [New] updated: 201708 +weight: -10 --- ## Reference diff --git a/tig.md b/tig.md index 06dd0aa34..21f841cf5 100644 --- a/tig.md +++ b/tig.md @@ -1,45 +1,86 @@ --- title: Tig category: Git +layout: 2017/sheet +updated: 201708.29 +weight: -3 --- ### Installing - $ brew install tig --HEAD - $ apt-get install tig +```bash +# MacOS + Homebrew +$ brew install tig --HEAD +``` + +```bash +# Ubuntu +$ sudo apt install tig +``` ### Invocation - tig +| Command | Description | +| --- | --- | +| `tig` | | +| --- | --- | +| `tig status` | Status | +| `tig blame FILE` | Blame | +| --- | --- | +| `tig master` | Show a branch | +| `tig test..master` | Show difference between two branches | +| `tig FILE` | Show history of file | +| `tig v0.0.3:README` | Show contents of file in a specific revision | - tig status +You can substitute `git log` → `tig`. - tig blame FILE - tig master # Show a branch - tig test..master # Show difference between two branches - tig FILE # Show history of file - tig v0.0.3:README # Show contents of file in a specific revision +## Shortcut keys +{: .-three-column} + +### Switching views + +| `m` | Main view | +| `s` | Status | +| `t` | Tree (files) | +| `g` | Grep | +| `h` | Help | +{: .-shortcuts} ### All views - ^N # Next on parent view - ^P # Previous on parent view +| Shortcut | Description | +| --- | --- | +| `j` `k` | Up/down | +| `↑J` `↑K` | Next/previous | +| --- | --- | +| `<` | Back | +| `↑R` | Refresh | +| `q` | Close | +| `↑Q` | Close all | +| --- | --- | +| `^N` | Next on parent view | +| `^P` | Previous on parent view | +{: .-shortcuts} ### `m` - Main view - D # Toggle between date display modes - A # Toggle between author display modes - C # Cherry pick a commit +| `↑D` | Toggle date display modes | +| `↑A` | Toggle author display modes | +| `↑X` | Toggle commit sha | +| `↑C` | Cherry pick a commit | +{: .-shortcuts} -### `S` - Stage view +### `s` - Stage view - u # Stage/unstage file or chunk - ! # Revert file or chunk - C # Commit - M # Merge - 1 # Stage line - [] # Increase/decrease the diff context +| `u` | Stage/unstage file or chunk | +| `!` | Revert file or chunk | +| `C` | Commit | +| `M` | Merge | +| `1` | Stage line | +| `[` `]` | Increase/decrease the diff context | +{: .-shortcuts} -### `H` - Branch view +### `h` - Branch view - i # Change sort header +| `i` | Change sort header | +{: .-shortcuts}