Skip to content

Commit

Permalink
Merge branch 'fix-ci'
Browse files Browse the repository at this point in the history
* Branch commit log:
  README.md: update deps
  Makefile: fix local jj-fzf invocations

Signed-off-by: Tim Janik <[email protected]>
  • Loading branch information
tim-janik committed Dec 12, 2024
2 parents d5efe09 + d4833e1 commit 5a6d9c7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ Q ::= $(if $(findstring 1, $(V)),, @)
all: check

check-deps: jj-fzf
$Q jj-fzf --version
$Q jj-fzf --help >/dev/null # check-deps
$Q ./jj-fzf --version
$Q ./jj-fzf --help >/dev/null # check-deps
install: check-deps
$(INSTALL) -t "$(bindir)" jj-fzf
uninstall:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ A separate view for the operations log `jj op log` enables fast previews of old
The available hotkeys are displayed onscreen for simple discoverability.
The commands and key bindings can also be displayed with `jj-fzf --help` and are documented in the wiki: [jj-fzf-help](https://github.com/tim-janik/jj-fzf/wiki/jj-fzf-help)

The `jj-fzf` script is implemented in bash-5.1, using fzf-0.29 and jj-0.23.0.
The `jj-fzf` script is implemented in bash-5.1, using fzf and jj with git.
Command line tools like sed, grep, gawk are assumed to provide GNU tool semantics.

<!-- USAGE -->
Expand Down

0 comments on commit 5a6d9c7

Please sign in to comment.