![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Tue, 21 Feb 2006 09:07:57 +0000 (01:07 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Tue, 21 Feb 2006 09:07:57 +0000 (01:07 -0800) | ||
| commit | deddce6f7b27108ff71ed5a3362faa721cb612a0 | |
| tree | 13e3a737eff23065c4138008fdfb6a592a0e6021 | tree | snapshot |
| parent | 98968450b2c10757d225412a3894ced4f319d472 | commit | diff |
| parent | e15f545155bb4b2cad4475a25cad8fb576d37dee | commit | diff |
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.
* 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 | diff1 | | diff2 | | blob | history |
| git-fmt-merge-msg.perl | diff1 | | diff2 | | blob | history |