Passionate Software-Developer from Germany, likes Ruby, Haskell, Linux, Emacs, Vim, Books, Fantasy, Lego, Boardgames, Whisky, Heavy Metal and Nature.
Chasing dreams.
@jksc Awesome! I didn't know about this, thanks! So this would be better (if one doesn't set the option somewhere else anyway):
(with-eval-after-load 'magit-diff
(setq transient-detect-key-conflicts t)
(transient-append-suffix 'magit-diff "r"
'("U" "Diff upstream..HEAD" (lambda ()
(interactive)
(magit-diff-range (concat (magit-get-upstream-branch) "..HEAD"))))))
I just realized that binding to `d u` will clobber the magit default "Diff unstaged" function. Better bind to `d U` and also load after `magit-diff`:
(with-eval-after-load 'magit-diff
(transient-append-suffix 'magit-diff "r"
'("U" "Diff upstream..HEAD" (lambda ()
(interactive)
(magit-diff-range (concat (magit-get-upstream-branch) "..HEAD"))))))
Did you know that you can set an upstream branch in emacs magit?
When set, you can see all commits you did compared to upstream and can more easily compare to the upstream with this little function:
(with-eval-after-load 'magit
(transient-append-suffix 'magit-diff "r"
'("u" "Diff upstream..HEAD" (lambda ()
(interactive)
(magit-diff-range (concat (magit-get-upstream-branch) "..HEAD"))))))
Pressing `d u` in magit status basically gives you a GitHub pull request view.
#emacs
Mastodon isn't perfect.
But the fact a social network exists that is completely free to use
has no venture capital investors
has no shareholders to answer to
has no growth targets
with a web interface with zero tracking cookies
and mobile apps with zero trackers at all
with ten thousand server administrators who donate their time for user safety
is - in my opinion - mindbogglingly cool, given the state of the world we live in. Not everything has to be shit. People make things better.
UNREAL is 25 years old today so I made a 3D short to celebrate one of the most important FPS (and engines!).
Fully rendered in Cinema 4D + Octane Render. Lots of materials/textures from GSG and some custom ones.
Fullscreen and headphones for the full 1998-nostalgia experience!
Vimeo link for better quality: https://vimeo.com/manage/videos/829125219
benjojo
Kevin Beaumont
Hetzner
Jose 