This page is not created by, affiliated with, or supported by Slack Technologies, Inc.
2018-12-18
Channels
- # adventofcode (62)
- # aws (5)
- # beginners (59)
- # calva (63)
- # cider (26)
- # cljdoc (1)
- # cljsrn (22)
- # clojure (99)
- # clojure-austin (1)
- # clojure-dev (19)
- # clojure-europe (4)
- # clojure-hamburg (2)
- # clojure-italy (3)
- # clojure-nl (23)
- # clojure-spec (2)
- # clojure-uk (85)
- # clojurescript (41)
- # core-async (17)
- # cursive (20)
- # data-science (11)
- # datascript (2)
- # datomic (31)
- # emacs (7)
- # figwheel (28)
- # figwheel-main (12)
- # graphql (2)
- # hyperfiddle (3)
- # juxt (1)
- # kaocha (2)
- # leiningen (5)
- # nrepl (13)
- # off-topic (45)
- # pathom (13)
- # pedestal (11)
- # re-frame (20)
- # reagent (10)
- # shadow-cljs (92)
- # spacemacs (9)
- # sql (39)
- # tools-deps (32)
- # unrepl (3)
I'm forced to rebase with a work project so I've found this most daunting. I used to hate how I'd do an F
pull from upstream and it would be defaulted to rebase and I had no idea what it was doing.
but it's pretty easy, albeit I've gotten some false renames from rebases, not sure if interactive would solve it
90% of the time I just do f o
to fetch origin
, master
, and then r e
to rebase origin/master
onto my branch
I still do pushing, pulling & rebasing on command line.
I'm not sure what's your workflow but I really feel that magit is hiding way too much - I basically cannot see what's happening under the hood.
I tried @lilactown’s workflow with f o
and r e
but found that the rebase ended with conflicts and magit didn't even tell me (only after doing magit status again) - just showed "rebasing...done"
yeah, I like magit because it is hiding a lot, unless I look. It is useful for debugging issues with other build steps that are git unrelated, but for the most part magit is a pretty solid tool that I have confidence in.
I'm using Ripgrep for counsel but not sure how to indicate file exclusions. I used to use AG and could just provide -G=.*js or something but now I can't. I have my rg command as follows
(setq counsel-rg-base-command
"rg -i -M 120 --no-heading --line-number --color never '%s' .")