git, branch v1.3.0-rc4

GIT v1.3.0-rc4

2006-04-15T06:21:34Z

I've merged everything I think is ready for 1.3.0, so this is the final round -- hopefully I can release this with minimum last-minute fixup as v1.3.0 early next week. Signed-off-by: Junio C Hamano

Merge branch 'dl/xdiff'

2006-04-15T05:58:17Z

* dl/xdiff: xdiff: post-process hunks to make them consistent.

Merge branch 'js/diffstat'

2006-04-15T04:55:23Z

* js/diffstat: diff --stat: no need to ask funcnames nor context. diff-options: add --stat (take 2) diff-options: add --stat (take 2)

Merge branch 'jc/fix5500'

2006-04-15T04:55:22Z

* jc/fix5500: t5500: test fix

Clean up trailing whitespace when pretty-printing commits

2006-04-15T04:46:08Z

Partly because we've messed up and now have some commits with trailing whitespace, but partly because this also just simplifies the code, let's remove trailing whitespace from the end when pretty-printing commits. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano

"git cmd -h" for shell scripts.

2006-04-14T22:54:51Z

Wrappers that use sh-setup took --help but not -h. Noticed by Sébastien Pierre. Signed-off-by: Junio C Hamano

git-log documentation

2006-04-14T19:59:09Z

Signed-off-by: Junio C Hamano

Retire git-log.sh (take #4)

2006-04-14T19:48:45Z

Noticed by Johannes. We do not install it anymore, but still have been shipping the source, which was crazy. Signed-off-by: Junio C Hamano

stripspace: incomplete line fix (take #2)

2006-04-14T19:41:51Z

This fixes f4ee3eb68906f079dea45de4f1bbb03d68189eb3 breakage, which added an extra trailing blank line after stripping trailing blank lines by mistake. Signed-off-by: Junio C Hamano

t5500: test fix

2006-04-14T05:28:06Z

Relying on eye-candy progress bar was fragile to begin with. Run fetch-pack with -k option, and count the objects that are in the pack that were transferred from the other end. Signed-off-by: Junio C Hamano