Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/maint-config-alias-fix' into maint | Junio C Hamano | 2011-06-01 | 1 | -2/+0 |
|\ | |||||
| * | config: make environment parsing routines static | Jeff King | 2011-05-24 | 1 | -2/+0 |
* | | Merge branch 'jk/git-connection-deadlock-fix' into maint | Junio C Hamano | 2011-05-26 | 1 | -0/+1 |
|\ \ | |||||
| * | | connect: let callers know if connection is a socket | Jeff King | 2011-05-16 | 1 | -0/+1 |
* | | | Merge branch 'jc/pack-objects-bigfile' into maint | Junio C Hamano | 2011-05-04 | 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 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'jh/push-default-upstream-configname' | Junio C Hamano | 2011-02-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | push.default: Rename 'tracking' to 'upstream' | Johan Herland | 2011-02-16 | 1 | -1/+1 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'lp/config-vername-check' | Junio C Hamano | 2011-02-27 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Sanity-check config variable names | Libor Pechacek | 2011-02-22 | 1 | -0/+1 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'nd/hash-object-sanity' | Junio C Hamano | 2011-02-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Make hash-object more robust against malformed objects | Nguyễn Thái Ngọc Duy | 2011-02-07 | 1 | -1/+1 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'nd/struct-pathspec' | Junio C Hamano | 2011-02-27 | 1 | -1/+16 |
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | / / / / / | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Convert ce_path_match() to use struct pathspec | Nguyễn Thái Ngọc Duy | 2011-02-03 | 1 | -1/+1 |
| * | | | | | | | tree_entry_interesting(): support wildcard matching | Nguyễn Thái Ngọc Duy | 2011-02-03 | 1 | -0/+2 |
| * | | | | | | | tree_entry_interesting(): support depth limit | Nguyễn Thái Ngọc Duy | 2011-02-03 | 1 | -0/+2 |
| * | | | | | | | Add struct pathspec | Nguyễn Thái Ngọc Duy | 2011-02-03 | 1 | -0/+11 |
| |/ / / / / / | |||||
* | | | | | | | update-index --refresh --porcelain: add missing const | Jonathan Nieder | 2011-02-22 | 1 | -1/+1 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | correct type of EMPTY_TREE_SHA1_BIN | Jonathan Nieder | 2011-02-14 | 1 | -1/+3 |
|/ / / / / | |||||
* | | | | | Merge branch 'nd/setup' | Junio C Hamano | 2010-12-28 | 1 | -0/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Remove all logic from get_git_work_tree() | Nguyễn Thái Ngọc Duy | 2010-12-22 | 1 | -1/+0 |
| * | | | | | setup: limit get_git_work_tree()'s to explicit setup case only | Nguyễn Thái Ngọc Duy | 2010-12-22 | 1 | -0/+1 |
| | |_|_|/ | |/| | | |