git/commit.c, branch v1.5.2

Merge branch 'maint'

2007-05-16T19:43:05Z

* maint: format-patch: add MIME-Version header when we add content-type. Fixed link in user-manual import-tars: Use the "Link indicator" to identify directories git name-rev writes beyond the end of malloc() with large generations Documentation/branch: fix small typo in -D example

format-patch: add MIME-Version header when we add content-type.

2007-05-16T19:37:25Z

When we add Content-Type: header, we should also add MIME-Version: header as well. Signed-off-by: Junio C Hamano

Merge branch 'maint'

2007-05-06T07:21:03Z

* maint: Small correction in reading of commit headers Documentation: fix typo in git-remote.txt Add test for blame corner cases. blame: -C -C -C blame: Notice a wholesale incorporation of an existing file. Fix --boundary output diff format documentation: describe raw combined diff format Mention version 1.5.1 in tutorial and user-manual Add --no-rebase option to git-svn dcommit Fix markup in git-svn man page

Small correction in reading of commit headers

2007-05-06T06:46:18Z

Check if a line of the header has enough characters to possibly contain the requested prefix. Signed-off-by: Alex Riesen Signed-off-by: Junio C Hamano

Merge branch 'maint'

2007-05-04T06:26:54Z

* maint: gitweb: use decode_utf8 directly posix compatibility for t4200 Document 'opendiff' value in config.txt and git-mergetool.txt Allow PERL_PATH="/usr/bin/env perl" Make xstrndup common diff.c: fix "size cache" handling. http-fetch: Disable use of curl multi support for libcurl < 7.16.

Make xstrndup common

2007-05-04T05:28:55Z

This also improves the implementation to match how strndup is specified (by GNU): if the length given is longer than the string, only the string's length is allocated and copied, but the string need not be null-terminated if it is at least as long as the given length. Signed-off-by: Daniel Barkalow Signed-off-by: Junio C Hamano

Add --date={local,relative,default}

2007-04-26T04:39:43Z

This adds --date={local,relative,default} option to log family of commands, to allow displaying timestamps in user's local timezone, relative time, or the default format. Existing --relative-date option is a synonym of --date=relative; we could probably deprecate it in the long run. Signed-off-by: Junio C Hamano

Clean up object creation to use more common code

2007-04-17T06:36:16Z

This replaces the fairly odd "created_object()" function that did _most_ of the object setup with a more complete "create_object()" function that also has a more natural calling convention. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano

Add %m to '--pretty=format:'

2007-04-12T03:02:03Z

When used with '--boundary A...B', this shows the -/ marker you would get with --left-right option to 'git-log' family. When symmetric diff is not used, everybody is shown to be on the "right" branch. Signed-off-by: Junio C Hamano

Merge branch 'maint' to synchronize with 1.5.0.6

2007-03-28T22:39:57Z