]> git.madduck.net Git - code/vcsh.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

projects / code / vcsh.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: e646aff 3c2288b)
Merge branch 'feature/gitattributes'
authorRichard Hartmann <richih@debian.org>
Fri, 21 Feb 2014 22:41:29 +0000 (23:41 +0100)
committerRichard Hartmann <richih@debian.org>
Fri, 21 Feb 2014 22:41:29 +0000 (23:41 +0100)
Conflicts:
vcsh

1  2 
vcsh patch | diff1 | diff2 | blob | history

diff --combined vcsh
index 18b938035aa2c8c218662692b56913d62f7e7bcb,a6653fc5790b3019084f9d0c8e44210407e7e0d7..418f78a72fa8309e89837cba1b4e8dcc25bd26bc
--- 1/vcsh
--- 2/vcsh
+++ b/vcsh
@@@ -74,7 -74,7 +74,7 @@@ f
  
  # Read defaults
  : ${VCSH_REPO_D:=$XDG_CONFIG_HOME/vcsh/repo.d}
 -: ${VCSH_HOOK_D:=$XDH_CONFIG_HOME/vcsh/hooks-enabled}
 +: ${VCSH_HOOK_D:=$XDG_CONFIG_HOME/vcsh/hooks-enabled}
  : ${VCSH_BASE:=$HOME}
  : ${VCSH_GITIGNORE:=exact}
  : ${VCSH_WORKTREE:=absolute}
@@@ -334,9 -334,11 +334,11 @@@ upgrade() 
                git config core.worktree "$VCSH_BASE"
        fi
        [ ! "x$VCSH_GITIGNORE" = 'xnone' ] && git config core.excludesfile ".gitignore.d/$VCSH_REPO_NAME"
 -      git config vcsh.vcsh         'true'
+       git config core.attributesfile ".gitattributes.d/$VCSH_REPO_NAME"
 +      git config vcsh.vcsh 'true'
        use
        [ -e "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME" ] && git add -f "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME"
+       [ -e "$VCSH_BASE/.gitattributes.d/$VCSH_REPO_NAME" ] && git add -f "$VCSH_BASE/.gitattributes.d/$VCSH_REPO_NAME"
        hook post-upgrade
  }
  
@@@ -498,6 -500,7 +500,7 @@@ check_dir() 
  
  check_dir "$VCSH_REPO_D"
  [ ! "x$VCSH_GITIGNORE" = 'xnone' ] && check_dir "$VCSH_BASE/.gitignore.d"
+ check_dir "$VCSH_BASE/.gitattributes.d"
  
  verbose "$VCSH_COMMAND begin"
  export VCSH_COMMAND=$(echo $VCSH_COMMAND | sed 's/-/_/g')
version controlled RC files

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.