Merge branch 'master' of git://git.kernel.org/pub/scm/git/gitmaster
commite443aa64249e69bceaf0a27a866d1d9c5c0166e0
authorJakub Narebski <jnareb@gmail.com>
Fri, 12 Apr 2013 21:07:07 +0000 (12 23:07 +0200)
committerJakub Narebski <jnareb@gmail.com>
Fri, 12 Apr 2013 21:07:07 +0000 (12 23:07 +0200)
tree8f93d1795d6df908198da261526f7d8c2d014359
parent330126c3e1c8aedb47b9a6e30ad9d26bc521338f
parente2af9e361b1d7452492baa073790b19292f9c038
Merge branch 'master' of git://git./git/git

* 'master' of git://git.kernel.org/pub/scm/git/git: (1061 commits)
  Update dtaft release notes to 1.8.3
  Typo fix: replacing it's -> its
  t: make PIPE a standard test prerequisite
  archive: clarify explanation of --worktree-attributes
  t/README: --immediate skips cleanup commands for failed tests
  remote-bzr: improve tag handling
  remote-bzr: fix utf-8 support for fetching
  Revert 4b7f53da7618 (simplify-merges: drop merge from irrelevant side branch, 2013-01-17)
  Git 1.8.2.1
  Update draft release notes to 1.8.3
  Git 1.8.1.6
  remote-helpers/test-bzr.sh: do not use "grep '\s'"
  gitremote-helpers(1): clarify refspec behaviour
  fast-export: Allow pruned-references in mark file
  remote-bzr: add utf-8 support for pushing
  remote-bzr: add utf-8 support for fetching
  remote-bzr: avoid unreferred tags
  remote-bzr: only update workingtree on local repos
  remote-bzr: set author if available
  remote-bzr: remove files before modifications
  ...
t/test-lib.sh