diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-15 16:30:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-15 16:30:13 -0700 |
| commit | 02071b27f1587c65ddc4779017a3ddceb777de9c (patch) | |
| tree | f834b5233f83c5a0c224c9704f188b7f026f40df /cache.h | |
| parent | c565cb452c1e20babe4d0632c58e0f11a9af30c4 (diff) | |
| parent | 3bfba20dae16384cb7112268462bd01d30d4a698 (diff) | |
| parent | 4dd1fbc7b1df0030f813a05cee19cad2c7a9cbf9 (diff) | |
| parent | 5bf29b950063c8fa2f3666cb6cf2ca20be61f3d1 (diff) | |
| download | git-02071b27f1587c65ddc4779017a3ddceb777de9c.tar.gz git-02071b27f1587c65ddc4779017a3ddceb777de9c.tar.xz | |
Merge branches 'jc/convert', 'jc/bigfile' and 'jc/replacing' into jc/streaming
* jc/convert:
convert: make it harder to screw up adding a conversion attribute
convert: make it safer to add conversion attributes
convert: give saner names to crlf/eol variables, types and functions
convert: rename the "eol" global variable to "core_eol"
* jc/bigfile:
Bigfile: teach "git add" to send a large file straight to a pack
index_fd(): split into two helper functions
index_fd(): turn write_object and format_check arguments into one flag
* jc/replacing:
read_sha1_file(): allow selective bypassing of replacement mechanism
inline lookup_replace_object() calls
read_sha1_file(): get rid of read_sha1_file_repl() madness
t6050: make sure we test not just commit replacement
Declare lookup_replace_object() in cache.h, not in commit.h