Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
  • 8 commits
  • 3 files changed
  • 0 comments
  • 1 contributor

Showing 3 changed files with 22 additions and 16 deletions. Show diff stats Hide diff stats

  1. +12 10 gitconfig
  2. +3 2 jshintrc
  3. +7 4 vimrc
22 gitconfig
@@ -2,13 +2,14 @@
2 2 excludesfile = /Users/mikl/.gitignore
3 3 legacyheaders = false
4 4 quotepath = false
  5 + autocrlf = input
5 6 [user]
6 7 name = Mikkel Hoegh
7 8 email = mikkel@hoegh.org
8 9 [format]
9 10 numbered = auto
10 11 [push]
11   - default = upstream
  12 + default = tracking
12 13 [repack]
13 14 usedeltabaseoffset = true
14 15 [color]
@@ -24,17 +25,18 @@
24 25 changes = diff --name-status -r
25 26 unadd = update-index --force-remove
26 27 [merge]
27   - tool = opendiff
28   -[mergetool "changesapp"]
29   - cmd = /usr/bin/env chdiff --wait "$LOCAL" "$REMOTE"
30   - keepBackup = false
31   - trustExitCode = false
32   -[mergetool "opendiff"]
33   - cmd = /usr/bin/opendiff -merge="$PWD/$MERGED" -ancestor="$PWD/$BASE" "$PWD/$LOCAL" "$PWD/$REMOTE"
34   - keepBackup = false
35   - trustExitCode = false
  28 + tool = vimdiff
  29 + conflictstyle = diff3
36 30 [github]
37 31 user = mikl
38 32
39 33 [mergetool]
40 34 keepBackup = false
  35 + prompt = false
  36 +
  37 +# Shortcuts
  38 +[url "ssh://git@git.drupal.org/project/"]
  39 + insteadOf = "drupal:"
  40 +[url "ssh://git@git.drupal.org/sandbox/"]
  41 + insteadOf = "drupalsand:"
  42 +
5 jshintrc
@@ -18,9 +18,10 @@
18 18 "immed" : true,
19 19 "iterator" : false,
20 20 "jquery" : true,
21   - "lastsemic" : true,
  21 + "lastsemic" : false,
22 22 "latedef" : true,
23   - "laxbreak" : false,
  23 + "laxbreak" : true,
  24 + "laxcomma" : true,
24 25 "loopfunc" : false,
25 26 "mootools" : false,
26 27 "multistr" : true,
11 vimrc
@@ -10,6 +10,8 @@ set nocompatible
10 10 let vam_install_path = expand('$HOME') . '/.vim/managed-addons'
11 11 exec 'set runtimepath+='.vam_install_path.'/vim-addon-manager'
12 12 call vam#ActivateAddons([
  13 + \ 'DetectIndent',
  14 + \ 'JavaScript_Indent',
13 15 \ 'Markdown',
14 16 \ 'PHP-correct-Indenting',
15 17 \ 'Powerline',
@@ -28,7 +30,8 @@ call vam#ActivateAddons([
28 30 \ 'ragtag',
29 31 \ 'snipmate-snippets',
30 32 \ 'surround',
31   - \ 'unimpaired'
  33 + \ 'unimpaired',
  34 + \ 'vim-json-bundle'
32 35 \], {'auto_install' : 1})
33 36
34 37 """"""""""""""""""""
@@ -181,10 +184,10 @@ let html_use_css = 1
181 184 let g:snips_author = 'Mikkel Hoegh' " SnipMate full name.
182 185
183 186 " Syntastic settings.
184   -let g:syntastic_auto_jump=1
185 187 let g:syntastic_auto_loc_list=1
186   -let g:syntastic_enable_signs=1
187   -let g:syntastic_jslint_conf=" --browser --goodparts --node --white --nosummary --unix_mode --nodebug_indentation --nobeep "
  188 +let g:syntastic_enable_signs=1 " Enable markers on the line containing a problem.
  189 +let g:syntastic_auto_jump=0 " Dont jump to the first line with a problem
  190 +let g:syntastic_phpcs_conf='--standard=Drupal --extensions=php,module,inc,install,test,profile,theme' " Test php,module,inc,install ... files with the Drupal CodingStandard
188 191
189 192 " Only do this part when compiled with support for autocommands
190 193 if has("autocmd")

No commit comments for this range

Something went wrong with that request. Please try again.