chiark / gitweb /
Merge branch 'master' into refs/top-bases/debian/locations
authorCarsten Hey <carsten@debian.org>
Mon, 26 Apr 2010 08:18:59 +0000 (10:18 +0200)
committerCarsten Hey <carsten@debian.org>
Mon, 26 Apr 2010 08:18:59 +0000 (10:18 +0200)
commit48dfe382c42da2c6efbcfa146d195ea301fd009a
tree1eeec18abc46952709397dcab0df6087d0771e6d
parent56820360e98daea1219b46401e5c67d38e35c2dd
parent566ea3fef82d408955285b2928b3f481486b809f
Merge branch 'master' into refs/top-bases/debian/locations

* master: (89 commits)
  adapt debian/changelog for 0.8-1.1
  do not fail if no quilt patches to pop
  tg-cleanexport is PHONY
  check for applied patches/uncommitted changes before tg-rmdir
  also remove the dpkgv3 patch stamp file
  simplify removal of files in tg-rmdir
  change section to vcs
  debian/changelog: new upstream release fixes #516188
  drop fixes/ensure-worktree
  debian/changelog: document new upstream release
  bump version number to 0.8
  Fix tg export --quilt --numbered w/ > 8 patches
  tg-push: add bash completion
  help: use pager
  tg-push: handle non-tgish branches
  tg-push: prevent handing branches more than once to git-push
  tg-push: remove useless warning about missing bases for non-tgish branches
  tg-update: fix user visible typo in info msg
  tg-remote: don't add push specs but warn about existing ones.
  tg-push: new command pushing a tgish branch
  ...