Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' | Junio C Hamano | 2010-02-07 | 1 | -0/+10 |
|\ | |||||
| * | archive: simplify archive format guessing | René Scharfe | 2010-02-07 | 1 | -0/+10 |
| * | Merge branch 'jc/maint-limit-note-output' into maint | Junio C Hamano | 2010-02-05 | 1 | -0/+59 |
| |\ | |||||
* | | | Fix invalid read in quote_c_style_counted | Jeff King | 2010-02-06 | 1 | -1/+18 |
* | | | t9501: Re-fix max load test | Brian Gernhardt | 2010-02-06 | 1 | -9/+2 |
* | | | t9501: Skip testing load if we can't detect it | Brian Gernhardt | 2010-02-05 | 1 | -1/+8 |
* | | | Revert 30816237 and 7e62265 | Junio C Hamano | 2010-02-05 | 1 | -52/+0 |
* | | | make --max-pack-size argument to 'git pack-object' count in bytes | Nicolas Pitre | 2010-02-03 | 1 | -6/+8 |
* | | | fix multiple issues with t5300 | Nicolas Pitre | 2010-02-03 | 1 | -20/+34 |
* | | | Merge branch 'ms/filter-branch-submodule' | Junio C Hamano | 2010-02-02 | 1 | -0/+39 |
|\ \ \ | |||||
| * | | | filter-branch: Add tests for submodules in tree-filter | Michal Sojka | 2010-01-28 | 1 | -0/+39 |
* | | | | Merge branch 'jh/gitweb-caching' (early part) | Junio C Hamano | 2010-02-02 | 2 | -5/+26 |
|\ \ \ \ | |||||
| * | | | | gitweb: Load checking | John 'Warthog9' Hawley | 2010-01-30 | 2 | -0/+23 |
| * | | | | gitweb: Make running t9501 test with '--debug' reliable and usable | Jakub Narebski | 2010-01-30 | 1 | -5/+3 |
* | | | | | Merge branch 'sp/fast-import-large-blob' | Junio C Hamano | 2010-02-02 | 2 | -1/+47 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Merge branch 'sp/maint-fast-import-large-blob' into sp/fast-import-large-blob | Junio C Hamano | 2010-02-01 | 2 | -1/+47 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | fast-import: Stream very large blobs directly to pack | Shawn O. Pearce | 2010-02-01 | 2 | -1/+47 |
| | |/ / | |||||
* | | | | grep --quiet: finishing touches | Junio C Hamano | 2010-01-28 | 1 | -0/+8 |
* | | | | reject @{-1} not at beginning of object name | Jeff King | 2010-01-28 | 1 | -1/+1 |
* | | | | fix parsing of @{-1}@{u} combination | Jeff King | 2010-01-28 | 1 | -2/+2 |
* | | | | test combinations of @{} syntax | Jeff King | 2010-01-28 | 1 | -0/+51 |
* | | | | t0101: use absolute date | Jeff King | 2010-01-28 | 1 | -1/+1 |
* | | | | tests: update tests that used to fail | Junio C Hamano | 2010-01-28 | 2 | -2/+2 |
* | | | | Merge branch 'jc/upstream-reflog' | Junio C Hamano | 2010-01-27 | 1 | -0/+29 |
|\ \ \ \ | |||||
| * | | | | Fix log -g this@{upstream} | Junio C Hamano | 2010-01-26 | 1 | -0/+29 |
* | | | | | Merge branch 'jc/maint-reflog-bad-timestamp' | Junio C Hamano | 2010-01-27 | 1 | -0/+45 |
|\ \ \ \ \ | |||||
| * | | | | | t0101: use a fixed timestamp when searching in the reflog | Junio C Hamano | 2010-01-27 | 1 | -2/+2 |
| * | | | | | approxidate_careful() reports errorneous date string | Junio C Hamano | 2010-01-26 | 1 | -0/+45 |
* | | | | | | Merge branch 'jh/maint-config-file-prefix' | Junio C Hamano | 2010-01-27 | 1 | -0/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | builtin-config: Fix crash when using "-f <relative path>" from non-root dir | Johan Herland | 2010-01-26 | 1 | -0/+11 |
* | | | | | | | Merge branch 'jl/diff-submodule-ignore' | Junio C Hamano | 2010-01-26 | 1 | -0/+67 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Teach diff --submodule that modified submodule directory is dirty | Jens Lehmann | 2010-01-24 | 1 | -0/+67 |
* | | | | | | | | fix portability issues with $ in double quotes | Stephen Boyd | 2010-01-26 | 9 | -48/+48 |
| |_|_|/ / / / |/| | | | | | | |||||
* | | | | | | | am: fix patch format detection for Thunderbird "Save As" emails | Stephen Boyd | 2010-01-25 | 1 | -0/+15 |
* | | | | | | | t0022: replace non-portable literal CR | Stephen Boyd | 2010-01-25 | 1 | -1/+1 |
* | | | | | | | tests: consolidate CR removal/addition functions | Stephen Boyd | 2010-01-25 | 6 | -58/+37 |
* | | | | | | | t5541-http-push: make grep expression check for one line only | Tay Ray Chuan | 2010-01-25 | 1 | -8/+4 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Merge branch 'jc/fix-tree-walk' | Junio C Hamano | 2010-01-24 | 11 | -20/+110 |
|\ \ \ \ \ \ | |||||
| * | | | | | | unpack-trees.c: look ahead in the index | Junio C Hamano | 2010-01-07 | 1 | -4/+4 |
| * | | | | | | Aggressive three-way merge: fix D/F case | Junio C Hamano | 2010-01-03 | 1 | -1/+1 |
| * | | | | | | traverse_trees(): handle D/F conflict case sanely | Junio C Hamano | 2010-01-03 | 2 | -3/+3 |
| * | | | | | | more D/F conflict tests | Junio C Hamano | 2010-01-03 | 1 | -0/+102 |
| * | | | | | | tests: move convenience regexp to match object names to test-lib.sh | Junio C Hamano | 2010-01-03 | 9 | -18/+6 |
* | | | | | | | Make test numbers unique | Johannes Sixt | 2010-01-24 | 1 | -0/+0 |
* | | | | | | | pull: re-fix command line generation | Junio C Hamano | 2010-01-24 | 1 | -0/+35 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge git://git.bogomips.org/git-svn | Junio C Hamano | 2010-01-23 | 7 | -127/+849 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-svn: allow subset of branches/tags to be specified in glob spec | Jay Soffian | 2010-01-23 | 2 | -0/+264 |
| * | | | | | | git-svn: allow UUID to be manually remapped via rewriteUUID | Jay Soffian | 2010-01-23 | 2 | -0/+100 |
| * | | | | | | git-svn: update svn mergeinfo test suite | Andrew Myrick | 2010-01-23 | 3 | -127/+485 |
* | | | | | | | t7800-difftool.sh: Test mergetool.prompt fallback | David Aguilar | 2010-01-22 | 1 | -0/+12 |
|/ / / / / / |