diff --git a/Custom-Commands-Compendium.md b/Custom-Commands-Compendium.md index 817e745..239e720 100644 --- a/Custom-Commands-Compendium.md +++ b/Custom-Commands-Compendium.md @@ -297,50 +297,60 @@ customCommands: command: tig blame -- {{.SelectedFile.Name}} context: files description: blame file at tree - subprocess: yes + output: terminal - key: b - command: tig blame {{.SelectedSubCommit.Sha}} -- {{.SelectedCommitFile.Name}} + command: tig blame {{.SelectedCommit.Sha}} -- {{.SelectedCommitFile.Name}} context: commitFiles description: blame file at revision - subprocess: yes + output: terminal - key: B command: tig blame -- {{.SelectedCommitFile.Name}} context: commitFiles description: blame file at tree - subprocess: yes + output: terminal ``` ## Browse files at revision via [tig](https://jonas.github.io/tig/) ```yml customCommands: - key: t - command: tig show {{.SelectedSubCommit.Sha}} + command: tig show {{.SelectedCommit.Sha}} context: subCommits description: tig commit (`t` again to browse files at revision) - subprocess: yes + output: terminal + - key: t + command: tig show {{.SelectedCommit.Sha}} + context: commits + description: tig commit (`t` again to browse files at revision) + output: terminal - key: t command: tig show {{.SelectedLocalBranch.Name}} context: localBranches description: tig branch (`t` again to browse files at revision) - subprocess: yes + output: terminal - key: t command: tig show {{.SelectedRemoteBranch.RemoteName}}/{{.SelectedRemoteBranch.Name}} context: remoteBranches description: tig branch (`t` again to browse files at revision) - subprocess: yes + output: terminal ``` ## File history via [tig](https://jonas.github.io/tig/) ```yml customCommands: - key: t - command: tig {{.SelectedSubCommit.Sha}} -- {{.SelectedCommitFile.Name}} + command: tig {{.SelectedCommit.Sha}} -- {{.SelectedCommitFile.Name}} context: commitFiles description: tig file (history of commits affecting file) - subprocess: yes + output: terminal - key: t command: tig -- {{.SelectedFile.Name}} context: files description: tig file (history of commits affecting file) - subprocess: yes + output: terminal + - key: t + command: git checkout --theirs {{.SelectedFile.Name}} + context: files + description: choose theirs (local) + output: log ``` ## Extract diff into index