adam/cshenv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches 'toolkit-git' and 'toolkit-changes' into initial-rework

Browse Source
This commit is contained in:
ADAM David Alan Martin
2014-01-27 21:10:41 -05:00
parent 5a533be42f d03293da68 5d82b822cb
commit e8034c77cb
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
git/gitconfig
View File

@ -18,13 +18,13 @@
last = cat-file commit HEAD last = cat-file commit HEAD
[color "branch"] [color "branch"]
current = green current = bold blue
[color "status"] [color "status"]
updated = green updated = bold blue
[color "diff"] [color "diff"]
new = 12 new = bold blue
[merge] [merge]
conflictstyle = diff3 conflictstyle = diff3

9
vim/vimrc.keymaps
View File

@ -1,5 +1,5 @@
"Adam Keymaps "Adam Keymaps
map _ {!}fmt -p -s -w 78 " map __ {!}fmt -p -s -w 78
map - ddkP map - ddkP
map + ddp map + ddp
@ -8,3 +8,10 @@ map + ddp
map Y y$ map Y y$
map zz zM map zz zM
map _w :!/bbsrc/bin/prod/bin/aotools/bdewrap
map _1 :.!bde_underlineheading
map _2 :.!bde_underlineheading -l2
map _3 :.!bde_underlineheading -l3
map _4 :.!bde_underlineheading -l4