diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-09 10:23:48 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-09 10:23:48 +0100 |
| commit | 4eb39e9bcccc54eb23af8a7e2676c63e5bf32866 (patch) | |
| tree | c6a62b68b86275d7db7bda65fa448c92feeba130 /unpack-trees.h | |
| parent | Merge branch 'pr/mergetool' (diff) | |
| parent | Use gitattributes to define per-path whitespace rule (diff) | |
| download | git-4eb39e9bcccc54eb23af8a7e2676c63e5bf32866.tar.xz git-4eb39e9bcccc54eb23af8a7e2676c63e5bf32866.zip | |
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 'unpack-trees.h')
0 files changed, 0 insertions, 0 deletions