projects
/
dupemerge
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
faster-dupemerge: version 0.20120103, update copyright year 2012,
[dupemerge]
/
faster-dupemerge
diff --git
a/faster-dupemerge
b/faster-dupemerge
index 4cdef9716fd5e5de600b9810a198936ca9d46301..2c85685b7056ba3c55abb05df99d84faf7aa34bb 100755
(executable)
--- a/
faster-dupemerge
+++ b/
faster-dupemerge
@@
-4,7
+4,7
@@
use Fcntl qw(:DEFAULT :flock);
use File::Compare;
use File::Temp;
use File::Compare;
use File::Temp;
-# Copyright (C) 2002-201
0
Zygo Blaxell <faster-dupemerge@mailtoo.hungrycats.org>
+# Copyright (C) 2002-201
2
Zygo Blaxell <faster-dupemerge@mailtoo.hungrycats.org>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@
-161,7
+161,8
@@
hard links).
--timestamps mtime may be different for identical files
--timestamps mtime may be different for identical files
- --skip-compare skip byte-by-byte file comparisons
+ --skip-compare skip byte-by-byte file comparisons,
+ compare only file hashes
--skip-hash[=N] skip calculation of hash function on files
larger than N bytes (default 1M).
--skip-hash[=N] skip calculation of hash function on files
larger than N bytes (default 1M).
@@
-174,6
+175,12
@@
hard links).
--verbose report files as they are considered
--zeros hard-link zero-length files too
--verbose report files as they are considered
--zeros hard-link zero-length files too
+
+--skip-compare and --skip-hash can be combined, in which case a file is
+either hashed (if it is below the --skip-hash size threshold) or compared
+(if it is above), but never both.
+
+Version: 0.20120103
USAGE
}
USAGE
}