]> arthur.barton.de Git - bup.git/commit
projects / bup.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5f68333 d6b576b)
Merge branch 'maint'
authorAvery Pennarun <apenwarr@gmail.com>
Thu, 2 Sep 2010 21:33:04 +0000 (14:33 -0700)
committerAvery Pennarun <apenwarr@gmail.com>
Thu, 2 Sep 2010 21:33:04 +0000 (14:33 -0700)
commit91efac924a2cd3b2393198c519115951476df042
tree5060deb558f84988d7cfb45200fa9f99db8db72etree | snapshot
parent5f68333aa1f7728da3a02282011268d7912069dacommit | diff
parentd6b576b029da7519b8f4c9e9b024576d4e74e66dcommit | diff
Merge branch 'maint'

* maint:
  git.py: recover more elegantly if a MIDX file has the wrong version.
  cmd/midx: add a new --max-files parameter.

Conflicts:
lib/bup/git.py
lib/bup/git.py diff1 | diff2 | blob | history
Alex' bup ("It backs things up") development repository