Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base: 183472623d
...
compare: 13461bbcf5
Checking mergeability… Don't worry, you can still create the pull request.
  • 8 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
Showing with 22 additions and 16 deletions.
  1. +12 −10 gitconfig
  2. +3 −2 jshintrc
  3. +7 −4 vimrc
View
22 gitconfig
@@ -2,13 +2,14 @@
excludesfile = /Users/mikl/.gitignore
legacyheaders = false
quotepath = false
+ autocrlf = input
[user]
name = Mikkel Hoegh
email = mikkel@hoegh.org
[format]
numbered = auto
[push]
- default = upstream
+ default = tracking
[repack]
usedeltabaseoffset = true
[color]
@@ -24,17 +25,18 @@
changes = diff --name-status -r
unadd = update-index --force-remove
[merge]
- tool = opendiff
-[mergetool "changesapp"]
- cmd = /usr/bin/env chdiff --wait "$LOCAL" "$REMOTE"
- keepBackup = false
- trustExitCode = false
-[mergetool "opendiff"]
- cmd = /usr/bin/opendiff -merge="$PWD/$MERGED" -ancestor="$PWD/$BASE" "$PWD/$LOCAL" "$PWD/$REMOTE"
- keepBackup = false
- trustExitCode = false
+ tool = vimdiff
+ conflictstyle = diff3
[github]
user = mikl
[mergetool]
keepBackup = false
+ prompt = false
+
+# Shortcuts
+[url "ssh://git@git.drupal.org/project/"]
+ insteadOf = "drupal:"
+[url "ssh://git@git.drupal.org/sandbox/"]
+ insteadOf = "drupalsand:"
+
View
5 jshintrc
@@ -18,9 +18,10 @@
"immed" : true,
"iterator" : false,
"jquery" : true,
- "lastsemic" : true,
+ "lastsemic" : false,
"latedef" : true,
- "laxbreak" : false,
+ "laxbreak" : true,
+ "laxcomma" : true,
"loopfunc" : false,
"mootools" : false,
"multistr" : true,
View
11 vimrc
@@ -10,6 +10,8 @@ set nocompatible
let vam_install_path = expand('$HOME') . '/.vim/managed-addons'
exec 'set runtimepath+='.vam_install_path.'/vim-addon-manager'
call vam#ActivateAddons([
+ \ 'DetectIndent',
+ \ 'JavaScript_Indent',
\ 'Markdown',
\ 'PHP-correct-Indenting',
\ 'Powerline',
@@ -28,7 +30,8 @@ call vam#ActivateAddons([
\ 'ragtag',
\ 'snipmate-snippets',
\ 'surround',
- \ 'unimpaired'
+ \ 'unimpaired',
+ \ 'vim-json-bundle'
\], {'auto_install' : 1})
""""""""""""""""""""
@@ -181,10 +184,10 @@ let html_use_css = 1
let g:snips_author = 'Mikkel Hoegh' " SnipMate full name.
" Syntastic settings.
-let g:syntastic_auto_jump=1
let g:syntastic_auto_loc_list=1
-let g:syntastic_enable_signs=1
-let g:syntastic_jslint_conf=" --browser --goodparts --node --white --nosummary --unix_mode --nodebug_indentation --nobeep "
+let g:syntastic_enable_signs=1 " Enable markers on the line containing a problem.
+let g:syntastic_auto_jump=0 " Dont jump to the first line with a problem
+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
" Only do this part when compiled with support for autocommands
if has("autocmd")

No commit comments for this range

Something went wrong with that request. Please try again.