diff options
author | Junio C Hamano <junkio@cox.net> | 2007-02-22 21:34:36 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-02-22 21:34:36 -0800 |
commit | ef1a5c2fa8bc67abea6cbacf975ea3260cd40fa3 (patch) | |
tree | b5a9d055692b1bca69bc349afcab05e495cf4257 /builtin-config.c | |
parent | e79cbbea9e5a9b08722f35dbca3d04c7f40a1aa1 (diff) | |
parent | 6716027108f426c83038b05baf3f20ceefe6fbd1 (diff) | |
parent | fe6e0eecb03379e6acb742f77b0b5f589a7b7422 (diff) | |
download | git-ef1a5c2fa8bc67abea6cbacf975ea3260cd40fa3.tar.gz git-ef1a5c2fa8bc67abea6cbacf975ea3260cd40fa3.tar.xz |
Merge branches 'lt/crlf' and 'jc/apply-config'
* lt/crlf:
Teach core.autocrlf to 'git apply'
t0020: add test for auto-crlf
Make AutoCRLF ternary variable.
Lazy man's auto-CRLF
* jc/apply-config:
t4119: test autocomputing -p<n> for traditional diff input.
git-apply: guess correct -p<n> value for non-git patches.
git-apply: notice "diff --git" patch again
Fix botched "leak fix"
t4119: add test for traditional patch and different p_value
apply: fix memory leak in prefix_one()
git-apply: require -p<n> when working in a subdirectory.
git-apply: do not lose cwd when run from a subdirectory.
Teach 'git apply' to look at $HOME/.gitconfig even outside of a repository
Teach 'git apply' to look at $GIT_DIR/config