This page is not created by, affiliated with, or supported by Slack Technologies, Inc.
2020-02-17
Channels
- # announcements (1)
- # aws (40)
- # babashka (37)
- # beginners (305)
- # chlorine-clover (15)
- # cider (5)
- # cljs-dev (40)
- # clojure (62)
- # clojure-europe (13)
- # clojure-nl (4)
- # clojure-spec (10)
- # clojure-sweden (2)
- # clojure-uk (59)
- # clojurescript (9)
- # core-async (13)
- # cursive (5)
- # data-science (2)
- # datascript (2)
- # datomic (29)
- # emacs (8)
- # fulcro (58)
- # lambdaisland (9)
- # leiningen (2)
- # lumo (3)
- # mid-cities-meetup (1)
- # midje (1)
- # off-topic (28)
- # shadow-cljs (32)
- # spacemacs (3)
- # sql (5)
- # tools-deps (1)
- # tree-sitter (1)
- # vscode (2)
- # yada (2)
I think a couple years ago I had a git diff
setup such that it displayed the diffs inline, within the current buffer (as opposed to allocating a distinct buffer just for the diffs)
Maybe it was magit-based.
The result looked similar to when one resolves merge conflicts with vc
mode: some lines would be applied a green background, others a red one.
Anyone has a such a setup? Can't find a satisfactory answer
Maybe I abandoned the idea back then because clojure-mode coloring wouldn't play nicely with git diff coloring... eg. syntax would look broken
Ah yes now I'm remembering better... for the following screenshot (very similar to what I had in mind), if both red and green lines start with (
but don't close with a )
, that would screw things:
I only use that view in Magit status, especially when staging specific lines of a change. For the source file buffer, I have marks in the right hand fringe which shows the lines that have changed, but not the diffs. I use vc-ediff if I want to compare the working copy to the HEAD commit. That seems to cover everything for me.
I also use diff-hl in combination with magit: https://github.com/dgutov/diff-hl
hey guys, I had forgotten about this one sorry looks like you both use a "fringe-based" approach. how well does it work for you? I recall giving a serious try to https://github.com/syohex/emacs-git-gutter but I had to desist as I found out it's an unmaintained program with some several flaws (things could easily fall out of sync, etc) Now I'd be a bit afraid of investing time in integrating a new lib again...
This is my config, works really well for me. https://practicalli.github.io/spacemacs/source-control/add-layers.html I use fringe as an indicator of change. To stage, commit or push I use magit status