diff options
author | Junio C Hamano <gitster@pobox.com> | 2007-12-09 12:23:48 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-12-09 12:23:48 +0300 |
commit | 4eb39e9bcccc54eb23af8a7e2676c63e5bf32866 (patch) | |
tree | c6a62b68b86275d7db7bda65fa448c92feeba130 /Makefile | |
parent | 05e74f4111b5ce5995dd1145f83398fe40a318e0 (diff) | |
parent | cf1b7869f0c571bbd4f72a4355d9aca558baa0da (diff) |
Merge branch 'jc/spht'
* jc/spht:
Use gitattributes to define per-path whitespace rule
core.whitespace: documentation updates.
builtin-apply: teach whitespace_rules
builtin-apply: rename "whitespace" variables and fix styles
core.whitespace: add test for diff whitespace error highlighting
git-diff: complain about >=8 consecutive spaces in initial indent
War on whitespace: first, a bit of retreat.
Conflicts:
cache.h
config.c
diff.c
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -313,7 +313,7 @@ LIB_OBJS = \ alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS) \ color.o wt-status.o archive-zip.o archive-tar.o shallow.o utf8.o \ convert.o attr.o decorate.o progress.o mailmap.o symlinks.o remote.o \ - transport.o bundle.o walker.o parse-options.o + transport.o bundle.o walker.o parse-options.o ws.o BUILTIN_OBJS = \ builtin-add.o \ |