chiark / gitweb /
Merge us:git/staging/rsync-backup
authorMark Wooding <mdw@distorted.org.uk>
Sat, 30 May 2015 09:14:12 +0000 (10:14 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Sat, 30 May 2015 09:14:12 +0000 (10:14 +0100)
commit9653f45d4e6e3009f86f912c7bee4441e9ae2b06
tree71be37674ee238ca4ccd6aa03baabfd674b78ff2
parent9a29ce39953352cc72726c869b2aefe19c762b67
parent1c0d86119920df1cedab397deaf1b6cd66f29ab9
Merge us:git/staging/rsync-backup

* us:git/staging/rsync-backup:
  rsync-backup.in, rsync-backup.8: Trim caches on fshash mismatch.
  rsync-backup.in (run): Option to preserve standard input.
  fshash.in, fshash.1: Evict cache entries identified by diff files.

Conflicts:
fshash.1
fshash.1