git/commit.h, branch v1.5.2

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

Add support for "commit name decorations" to log family of commands

2007-04-16T23:51:11Z

This adds "--decorate" as a log option, which prints out the ref names of any commits that are shown. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano

Merge branch 'js/commit-format'

2007-03-02T08:37:12Z

* js/commit-format: show_date(): rename the "relative" parameter to "mode" Actually make print_wrapped_text() useful pretty-formats: add 'format:'

pretty-formats: add 'format:'

2007-02-23T05:03:41Z

With this patch, $ git show -s \ --pretty=format:' Ze komit %h woss%n dunn buy ze great %an' shows something like Ze komit 04c5c88 woss dunn buy ze great Junio C Hamano The supported placeholders are: '%H': commit hash '%h': abbreviated commit hash '%T': tree hash '%t': abbreviated tree hash '%P': parent hashes '%p': abbreviated parent hashes '%an': author name '%ae': author email '%ad': author date '%aD': author date, RFC2822 style '%ar': author date, relative '%at': author date, UNIX timestamp '%cn': committer name '%ce': committer email '%cd': committer date '%cD': committer date, RFC2822 style '%cr': committer date, relative '%ct': committer date, UNIX timestamp '%e': encoding '%s': subject '%b': body '%Cred': switch color to red '%Cgreen': switch color to green '%Cblue': switch color to blue '%Creset': reset color '%n': newline Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Merge branch 'jc/merge-base' (early part)

2007-02-14T00:54:35Z

This contains an evil merge to fast-import, in order to resolve in_merge_bases() update.

is_repository_shallow(): prototype fix.

2007-01-22T06:22:23Z

Signed-off-by: Junio C Hamano

Allow in_merge_bases() to take more than one reference commits.

2007-01-10T01:57:03Z

The internal function in_merge_bases(A, B) is used to make sure that commit A is an ancestor of commit B. This changes the signature of it to take an array of B's and updates its current callers. Signed-off-by: Junio C Hamano

Merge branch 'master' into js/shallow

2006-12-27T10:43:46Z

This is to adjust to: count-objects -v: show number of packs as well. which will break a test in this series. Signed-off-by: Junio C Hamano

Move in_merge_bases() to commit.c

2006-12-21T01:22:10Z

This reasonably useful function was hidden inside builtin-branch.c

allow deepening of a shallow repository

2006-11-24T23:42:49Z

Now, by saying "git fetch -depth " you can deepen a shallow repository. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano