Mercurial > dotfiles
changeset 393:8bf3eed26496
Merged changes.
| author | Ludovic Chabant <ludovic@chabant.com> |
|---|---|
| date | Tue, 22 Aug 2017 13:11:51 -0700 |
| parents | c175fda4aa2e (current diff) 92ae7310bb1b (diff) |
| children | e9b3a01a14d2 |
| files | .hgsubstate |
| diffstat | 7 files changed, 19 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsub Tue Aug 22 13:08:15 2017 -0700 +++ b/.hgsub Tue Aug 22 13:11:51 2017 -0700 @@ -48,6 +48,7 @@ lib/hg/allpaths = https://bitbucket.org/ludovicchabant/allpaths lib/hg/mercurial-cli-templates = https://bitbucket.org/sjl/mercurial-cli-templates lib/hg/hg-prompt = https://bitbucket.org/sjl/hg-prompt +lib/hg/fast-hg-prompt = https://bitbucket.org/ludovicchabant/fast-hg-prompt lib/hg/mutable-history = https://www.mercurial-scm.org/repo/evolve lib/hg/terse-status = https://bitbucket.org/durin42/terse-status lib/hg/path-pattern = https://bitbucket.org/Mekk/mercurial-path_pattern
--- a/.hgsubstate Tue Aug 22 13:08:15 2017 -0700 +++ b/.hgsubstate Tue Aug 22 13:11:51 2017 -0700 @@ -1,10 +1,11 @@ 5c5203cc2a62a65eea3bce3931a8e41938341bcd lib/fish/virtualfish 772d75b1a0309b89b96c4ad1c0b2f284104de974 lib/hg/allpaths -fec6e12dedd8811869d1bb520cd26ce43cfd28ef lib/hg/hg-git +871944d0db5cc714bfee2bd6087c380d3ef6a96f lib/hg/fast-hg-prompt +4d63f2eb60fd6399d5f50d4703d8ced8132ce359 lib/hg/hg-git 7d99080f276f49e3638ba13b4f5c1cd2dc4cc21f lib/hg/hg-git-sync 5334581e231a5167d03689ff47b3a6fdf082011c lib/hg/hg-prompt 1fc4a9fbead7e0acc4c828b346f3be2658ec3df9 lib/hg/mercurial-cli-templates -e723a35599f3636cb060cefc5ebb79788ce1c7dc lib/hg/mutable-history +21f06d9322316c9cc17eaebf5d4f40b9f24304f6 lib/hg/mutable-history d920e3425db554497a2cfaf1a2548eafbdc8b0e7 lib/hg/onsub 8e91a585024cdf2d14adaf548c21799edce0d6c0 lib/hg/path-pattern 2d9820cf595263bc7c651295b83f02525a23ca4a lib/hg/terse-status
--- a/fish/config.fish Tue Aug 22 13:08:15 2017 -0700 +++ b/fish/config.fish Tue Aug 22 13:11:51 2017 -0700 @@ -128,7 +128,7 @@ # Virtualenv wrapper for Fish {{{ -eval (python -m virtualfish) +eval (/usr/local/bin/python2.7 -m virtualfish) #set -g VIRTUALFISH_COMPAT_ALIASES # uncomment for virtualenvwrapper-style commands #. $HOME/.config/fish/virtualfish/virtual.fish
--- a/git/gitconfig Tue Aug 22 13:08:15 2017 -0700 +++ b/git/gitconfig Tue Aug 22 13:11:51 2017 -0700 @@ -12,3 +12,9 @@ [include] path = gitconfig-local +[difftool "sourcetree"] + cmd = opendiff \"$LOCAL\" \"$REMOTE\" + path = +[mergetool "sourcetree"] + cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\" + trustExitCode = true
--- a/mutt/muttrc Tue Aug 22 13:08:15 2017 -0700 +++ b/mutt/muttrc Tue Aug 22 13:11:51 2017 -0700 @@ -40,6 +40,7 @@ set date_format = "%d/%m/%Y" # Show the date like you're civilized set index_format = "[%Z] %D %-20.20F %s" set collapse_unread +set text_flowed ignore "Authentication-Results:" ignore "DomainKey-Signature:"
--- a/qutebrowser/keys.conf Tue Aug 22 13:08:15 2017 -0700 +++ b/qutebrowser/keys.conf Tue Aug 22 13:11:51 2017 -0700 @@ -173,12 +173,6 @@ scroll left h -scroll down - j - -scroll up - k - scroll right l @@ -439,6 +433,12 @@ set-cmd-text :open -w {url:pretty} W +run-with-count 3 scroll down + j + +run-with-count 3 scroll up + k + [insert] # Keybindings for insert mode. # Since normal keypresses are passed through, only special keys are