4 ms·

(Author) Please reply to this comment with any bugs you face and I’ll do my best to fix them ASAP. I recommend you check out the log command. It’s quite powerf

(Author) Please reply to this comment with any bugs you face and I’ll do my best to fix them ASAP. I recommend you check out the log command. It’s quite powerful and the closest to a “git history search engine” I’ve ever seen.

hesk 6y ago
The screenshot looks nice but I can't figure out how to get it working. I can mark files with TAB but how can I edit/stage/commit? The ALT-X hotkeys create characters which are used to refine the search.
- parentheses 6y ago
  Depends on how your terminal is set up. Often times folks remap those keys and that prevents `fzf` from receiving them. If that’s the case, try a new terminal emulator as an experiment.
  - hesk 6y ago
    I tried the macOS terminal, iTerm2, and the xterm that ships with XQuartz. None of them work. I think the problem is that by default Alt+X creates printable characters on macOS. For example: Alt-E => € Alt-U => ¨ Alt-C => ç Disabling this is not really an option because I rely on them. EDIT: formatting
    - soraminazuki 6y ago
      I think it's nicer if it used ctrl- bindings instead.
    - parentheses 6y ago
      i'll have to make this configurable in some sort of way
    - lloeki 6y ago
      Option as Meta "solves" that in prefs. In quotes because Terminal.app makes it apply to both Option keys so you can't have it as modifier to enter special chars at the same time on the other key (iTerm2 has such an option). This makes that checkbox useless on e.g French layout (which has the pipe, tilde, square brackets, and braces behind Option). Meta+<key> is actually sending ESC char followed by <key char> veryfastantaneously, so ESC+<key> (at almost the same time, and in that order) works, which has saved me from time to time. Also see timeoutlen in vim, keyseq-timeout in inputrc/deadline, maptimeout in screen, and escape-time in tmux.
deleted 6y ago
[deleted]
AdamGibbins 6y ago
The doc seems to imply if I have delta installed, it will just automatically use it. But that doesn't seem to be the case, git fuzzy log output looks the same with and without? I have my git pager set to use delta, so I know it works.
- parentheses 6y ago
  Try `export`ing this env var: https://github.com/bigH/dotfiles/blob/master/configs/core.sh#L138 https://github.com/bigH/dotfiles/blob/master/configs/core.sh... In the meanwhile, I'll try to repro.
  - AdamGibbins 6y ago
    Also no change, oddly.
  - IggleSniggle 6y ago
    I believe I ran into the same thing. If the other commenter is anything like me, the underlying cause is that `delta` did not support unified diffs until version 0.0.15 (ie only for the last 6 months). I don't even remember when I installed delta the first time, since I ultimately liked ydiff better for side-by-side diffing with line-numbers. I thought I'd give delta a try again only because of this fzf endorsement of it (context is a little different, too, obviously). My perfect diff tooling would support both drop-in replacement for `diff` but unfortunately I still haven't found the one that checks all the feature boxes I want yet. But this fzf wrapper is AWESOME! I tried to do something similar a few months ago and ran out of steam. Glad you didn't! Anyway, updating delta to latest did the trick for me. Note that if you are using homebrew, the formula name is git-delta
    - AdamGibbins 6y ago
      I have 0.1.1 from homebrew.
    - Myrmornis 6y ago
      (delta author here) Line numbers have been added to delta in a contributed PR: https://github.com/dandavison/delta/pull/190 https://github.com/dandavison/delta/pull/190. It will merge soon and be in the next release. And we have an open issue for side-by-side view: https://github.com/dandavison/delta/issues/86 https://github.com/dandavison/delta/issues/86. I definitely plan to get to it! The next release of delta will also provide diff-so-fancy and diff-highlight emulation modes. See https://github.com/dandavison/delta/issues/205 https://github.com/dandavison/delta/issues/205

hesk 6y ago

The screenshot looks nice but I can't figure out how to get it working. I can mark files with TAB but how can I edit/stage/commit? The ALT-X hotkeys create characters which are used to refine the search.

parentheses 6y ago
Depends on how your terminal is set up. Often times folks remap those keys and that prevents `fzf` from receiving them. If that’s the case, try a new terminal emulator as an experiment.
- hesk 6y ago
  I tried the macOS terminal, iTerm2, and the xterm that ships with XQuartz. None of them work. I think the problem is that by default Alt+X creates printable characters on macOS. For example: Alt-E => € Alt-U => ¨ Alt-C => ç Disabling this is not really an option because I rely on them. EDIT: formatting
  - soraminazuki 6y ago
    I think it's nicer if it used ctrl- bindings instead.
  - parentheses 6y ago
    i'll have to make this configurable in some sort of way
  - lloeki 6y ago
    Option as Meta "solves" that in prefs. In quotes because Terminal.app makes it apply to both Option keys so you can't have it as modifier to enter special chars at the same time on the other key (iTerm2 has such an option). This makes that checkbox useless on e.g French layout (which has the pipe, tilde, square brackets, and braces behind Option). Meta+<key> is actually sending ESC char followed by <key char> veryfastantaneously, so ESC+<key> (at almost the same time, and in that order) works, which has saved me from time to time. Also see timeoutlen in vim, keyseq-timeout in inputrc/deadline, maptimeout in screen, and escape-time in tmux.

deleted 6y ago

[deleted]

AdamGibbins 6y ago

The doc seems to imply if I have delta installed, it will just automatically use it. But that doesn't seem to be the case, git fuzzy log output looks the same with and without? I have my git pager set to use delta, so I know it works.

parentheses 6y ago
Try `export`ing this env var: https://github.com/bigH/dotfiles/blob/master/configs/core.sh#L138 https://github.com/bigH/dotfiles/blob/master/configs/core.sh... In the meanwhile, I'll try to repro.
- AdamGibbins 6y ago
  Also no change, oddly.
- IggleSniggle 6y ago
  I believe I ran into the same thing. If the other commenter is anything like me, the underlying cause is that `delta` did not support unified diffs until version 0.0.15 (ie only for the last 6 months). I don't even remember when I installed delta the first time, since I ultimately liked ydiff better for side-by-side diffing with line-numbers. I thought I'd give delta a try again only because of this fzf endorsement of it (context is a little different, too, obviously). My perfect diff tooling would support both drop-in replacement for `diff` but unfortunately I still haven't found the one that checks all the feature boxes I want yet. But this fzf wrapper is AWESOME! I tried to do something similar a few months ago and ran out of steam. Glad you didn't! Anyway, updating delta to latest did the trick for me. Note that if you are using homebrew, the formula name is git-delta
  - AdamGibbins 6y ago
    I have 0.1.1 from homebrew.
  - Myrmornis 6y ago
    (delta author here) Line numbers have been added to delta in a contributed PR: https://github.com/dandavison/delta/pull/190 https://github.com/dandavison/delta/pull/190. It will merge soon and be in the next release. And we have an open issue for side-by-side view: https://github.com/dandavison/delta/issues/86 https://github.com/dandavison/delta/issues/86. I definitely plan to get to it! The next release of delta will also provide diff-so-fancy and diff-highlight emulation modes. See https://github.com/dandavison/delta/issues/205 https://github.com/dandavison/delta/issues/205