Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/maint-config-alias-fix' | Junio C Hamano | 2011-05-30 | 1 | -2/+0 |
|\ | |||||
| * | config: make environment parsing routines static | Jeff King | 2011-05-24 | 1 | -2/+0 |
* | | Merge branch 'jc/bigfile' | Junio C Hamano | 2011-05-25 | 1 | -2/+5 |
|\ \ | |||||
| * | | index_fd(): turn write_object and format_check arguments into one flag | Junio C Hamano | 2011-05-09 | 1 | -2/+5 |
* | | | Merge branch 'mg/config-symbolic-constants' | Junio C Hamano | 2011-05-23 | 1 | -0/+10 |
|\ \ \ | |||||
| * | | | config: define and document exit codes | Michael J Gruber | 2011-05-17 | 1 | -0/+10 |
* | | | | Merge branch 'jc/magic-pathspec' | Junio C Hamano | 2011-05-23 | 1 | -4/+4 |
|\ \ \ \ | |||||
| * | | | | fix overslow :/no-such-string-ever-existed diagnostics | Junio C Hamano | 2011-05-10 | 1 | -4/+4 |
* | | | | | Merge branch 'jc/replacing' | Junio C Hamano | 2011-05-19 | 1 | -4/+14 |
|\ \ \ \ \ | |||||
| * | | | | | read_sha1_file(): allow selective bypassing of replacement mechanism | Junio C Hamano | 2011-05-15 | 1 | -1/+6 |
| * | | | | | inline lookup_replace_object() calls | Junio C Hamano | 2011-05-15 | 1 | -2/+10 |
| * | | | | | read_sha1_file(): get rid of read_sha1_file_repl() madness | Junio C Hamano | 2011-05-15 | 1 | -5/+1 |
| * | | | | | Declare lookup_replace_object() in cache.h, not in commit.h | Junio C Hamano | 2011-05-15 | 1 | -0/+1 |
* | | | | | | Merge branch 'jk/git-connection-deadlock-fix' | Junio C Hamano | 2011-05-19 | 1 | -0/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | connect: let callers know if connection is a socket | Jeff King | 2011-05-16 | 1 | -0/+1 |
* | | | | | | convert: rename the "eol" global variable to "core_eol" | Junio C Hamano | 2011-05-09 | 1 | -1/+1 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge branch 'im/hashcmp-optim' | Junio C Hamano | 2011-05-06 | 1 | -4/+14 |
|\ \ \ \ \ | |||||
| * | | | | | hashcmp(): inline memcmp() by hand to optimize | Ingo Molnar | 2011-04-28 | 1 | -4/+14 |
* | | | | | | Merge branch 'nd/struct-pathspec' | Junio C Hamano | 2011-05-06 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | pathspec: rename per-item field has_wildcard to use_wildcard | Junio C Hamano | 2011-04-05 | 1 | -1/+1 |
* | | | | | | Merge branch 'jc/pack-objects-bigfile' | Junio C Hamano | 2011-04-27 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Teach core.bigfilethreashold to pack-objects | Junio C Hamano | 2011-04-05 | 1 | -0/+1 |
* | | | | | | | Merge branch 'nd/init-gitdir' | Junio C Hamano | 2011-04-01 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | init, clone: support --separate-git-dir for .git file | Nguyễn Thái Ngọc Duy | 2011-03-19 | 1 | -0/+1 |
* | | | | | | | | Merge branch 'jc/index-update-if-able' | Junio C Hamano | 2011-03-26 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | diff/status: refactor opportunistic index update | Junio C Hamano | 2011-03-21 | 1 | -0/+1 |
* | | | | | | | | | Merge branch 'jc/maint-rerere-in-workdir' | Junio C Hamano | 2011-03-26 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | rerere: make sure it works even in a workdir attached to a young repository | Junio C Hamano | 2011-03-23 | 1 | -0/+1 |
* | | | | | | | | | | Merge branch 'lt/default-abbrev' | Junio C Hamano | 2011-03-23 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Make the default abbrev length configurable | Linus Torvalds | 2011-03-11 | 1 | -2/+3 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jn/test-sanitize-git-env' | Junio C Hamano | 2011-03-22 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
| * | | | | | | | | | config: drop support for GIT_CONFIG_NOGLOBAL | Jonathan Nieder | 2011-03-15 | 1 | -1/+0 |
* | | | | | | | | | | Merge branch 'ab/i18n-basic' | Junio C Hamano | 2011-03-19 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | i18n: add no-op _() and N_() wrappers | Ævar Arnfjörð Bjarmason | 2011-03-08 | 1 | -0/+1 |
* | | | | | | | | | | | Merge branch 'jk/trace-sifter' | Junio C Hamano | 2011-03-19 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | add packet tracing debug code | Jeff King | 2011-03-08 | 1 | -0/+2 |
| * | | | | | | | | | | trace: add trace_strbuf | Jeff King | 2011-03-08 | 1 | -0/+1 |
| * | | | | | | | | | | trace: factor out "do we want to trace" logic | Jeff King | 2011-03-08 | 1 | -0/+1 |
| * | | | | | | | | | | trace: refactor to support multiple env variables | Jeff King | 2011-03-08 | 1 | -1/+1 |
| * | | | | | | | | | | trace: add trace_vprintf | Jeff King | 2011-03-08 | 1 | -0/+1 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Name make_*_path functions more accurately | Carlos Martín Nieto | 2011-03-17 | 1 | -3/+3 |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-03-16 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jh/push-default-upstream-configname' into maint | Junio C Hamano | 2011-03-16 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | enums: omit trailing comma for portability | Jonathan Nieder | 2011-03-16 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge branch 'nd/struct-pathspec' | Junio C Hamano | 2011-03-16 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | declare 1-bit bitfields to be unsigned | Jonathan Nieder | 2011-03-15 | 1 | -3/+3 |
* | | | | | | | | | | | | Merge branch 'sp/maint-fd-limit' | Junio C Hamano | 2011-03-15 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | sha1_file.c: Don't retain open fds on small packs | Shawn O. Pearce | 2011-03-02 | 1 | -1/+2 |
* | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-03-10 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Revert "core.abbrevguard: Ensure short object names stay unique a bit longer" | Junio C Hamano | 2011-03-10 | 1 | -1/+0 |
| |/ / / / / / / / / / |