mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'jim/jim'

Browse source
This commit is contained in:
Joey Hess 2016-09-05 12:14:43 -04:00
commit 64f2f24841
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Build/mdwn2man
View file

@ -10,7 +10,7 @@ while (<>) {
s{(\\?)\[\[([^\s\|\]]+)(\|[^\s\]]+)?\]\]}{$1 ? "[[$2]]" : $2}eg; s{(\\?)\[\[([^\s\|\]]+)(\|[^\s\]]+)?\]\]}{$1 ? "[[$2]]" : $2}eg;
s/\`([^\`]*)\`/\\fB$1\\fP/g; s/\`([^\`]*)\`/\\fB$1\\fP/g;
s/\`//g; s/\`//g;
s/^\s*\./\\&./g; s/^ *\./\\&./g;
if (/^#\s/) { if (/^#\s/) {
s/^#\s/.SH /; s/^#\s/.SH /;
<>; # blank; <>; # blank;

2
doc/git-annex-smudge.mdwn
View file

@ -25,7 +25,7 @@ not need to configure it manually.
clean = git-annex smudge --clean %f clean = git-annex smudge --clean %f
To make git use that filter driver, it needs to be configured in To make git use that filter driver, it needs to be configured in
the .gitattributes file or in `.git/config/attributes`. The latter the `.gitattributes` file or in `.git/info/attributes`. The latter
is normally configured when a repository is initialized, with the following is normally configured when a repository is initialized, with the following
contents: contents: