]> 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:

Merge commit 'ccf40b91a67127084ee81e875ee5b77b3b0f019d'
authorRichard Hartmann <richih@debian.org>
Sun, 27 Oct 2013 11:16:27 +0000 (12:16 +0100)
committerRichard Hartmann <richih@debian.org>
Sun, 27 Oct 2013 11:16:27 +0000 (12:16 +0100)
Conflicts:
Makefile

1  2 
Makefile

diff --cc Makefile
index d62b5cffe3ee51059ca3fe21842812963daae8c3,18ea7cd71615aba3896ce9707af428458ae12843..429ecd6e589ea37cad8cf40716767c088e374347
+++ b/Makefile
@@@ -1,6 -1,5 +1,7 @@@
  PREFIX=/usr
 +DOCDIR=$(PREFIX)/share/doc/$(self)
 +ZSHDIR=$(PREFIX)/share/zsh/vendor-completions
+ RONN ?= ronn
  
  self=vcsh
  manpages=$(self).1