]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 12 Apr 2013 00:41:48 +0000 (17:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 12 Apr 2013 00:41:48 +0000 (17:41 -0700)
* maint:
  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

1  2 
t/README
t/test-lib.sh

diff --cc t/README
Simple merge
diff --cc t/test-lib.sh
Simple merge