~mdw / profile / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e3a7c1c) | patch
dot/emacs: Don't automatically stage files after resolving conflicts.
authorMark Wooding <mdw@distorted.org.uk>
Sat, 11 Apr 2020 01:17:51 +0000 (02:17 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Sat, 11 Apr 2020 01:17:51 +0000 (02:17 +0100)
commit5829b6b1d3f2bab6bbdeef92f7b3e0f85db6ca33
tree3157fae5efcc7d275ad9690173d7f698b3251b7btree | snapshot (tar.gz zip)
parente3a7c1c213688cc551955f8f7d43ae49d32fb269commit | diff
dot/emacs: Don't automatically stage files after resolving conflicts.

I like to check the combined diff before staging, to make sure that my
proposed resolution looks right.
dot/emacs diff | blob | blame | history
Dotfiles and other configuration.