diff options
author | Junio C Hamano <junkio@cox.net> | 2007-04-29 01:52:43 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-04-29 01:52:43 -0700 |
commit | 39231b1c32caee10c7ac3397341ea0c6cf56e7f9 (patch) | |
tree | 5e51fb9d639bf6b6b99ae5d01286360b7303f2f1 /merge-recursive.c | |
parent | 4342572600f446b9f8db553df03d458229f944dd (diff) | |
parent | e9d54bd18bcf5dc9eb68eb1cba9a6a7ba3f71fd6 (diff) | |
download | git-39231b1c32caee10c7ac3397341ea0c6cf56e7f9.tar.gz git-39231b1c32caee10c7ac3397341ea0c6cf56e7f9.tar.xz |
Merge branch 'maint'
* maint:
http.c: Fix problem with repeated calls of http_init
Add missing reference to GIT_COMMITTER_DATE in git-commit-tree documentation
Fix import-tars fix.
Update .mailmap with "Michael"
Do not barf on too long action description
Catch empty pathnames in trees during fsck
Don't allow empty pathnames in fast-import
import-tars: be nice to wrong directory modes
git-svn: Added 'find-rev' command
git shortlog documentation: add long options and fix a typo
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions