Merge branch 'pj/portable' into next
authorJunio C Hamano <junkio@cox.net>
Tue, 21 Feb 2006 09:07:57 +0000 (01:07 -0800)
committerJunio C Hamano <junkio@cox.net>
Tue, 21 Feb 2006 09:07:57 +0000 (01:07 -0800)
commitdeddce6f7b27108ff71ed5a3362faa721cb612a0
tree13e3a737eff23065c4138008fdfb6a592a0e6021
parent98968450b2c10757d225412a3894ced4f319d472
parente15f545155bb4b2cad4475a25cad8fb576d37dee
Merge branch 'pj/portable' into next

* pj/portable:
  Makefile tweaks: Solaris 9+ dont need iconv / move up uname variables
  Merge part of jc/portable branch
  git-mktree: reverse of git-ls-tree.
  Merge branch 'lt/merge-tree'
  Merge branch 'jc/ident'
  cherry-pick/revert: error-help message rewording.
  Fix fmt-merge-msg counting.
Makefile
git-fmt-merge-msg.perl