diff options
author | Junio C Hamano <junkio@cox.net> | 2006-03-02 01:06:12 (GMT) |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-03-02 01:06:12 (GMT) |
commit | e1a0c8b1483b38d32d3870408e03a6c1b340aa15 (patch) | |
tree | 7b803af235c934438e1133095c0ade9f4843db27 /unpack-objects.c | |
parent | 9e7c73de0bcd410d12f897b19419dd35accd961e (diff) | |
parent | 12cbbdc40b50458b29b76af740ddc0ab1979b322 (diff) | |
download | git-1.2.4.zip git-1.2.4.tar.gz git-1.2.4.tar.bz2 |
Merge branch 'lt/fix-apply' into maintv1.2.4
* lt/fix-apply:
git-am: --whitespace=x option.
git-apply: war on whitespace -- finishing touches.
git-apply --whitespace=nowarn
apply --whitespace: configuration option.
apply: squelch excessive errors and --whitespace=error-all
apply --whitespace fixes and enhancements.
The war on trailing whitespace
Diffstat (limited to 'unpack-objects.c')
0 files changed, 0 insertions, 0 deletions