Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint-1.6.1' into maint-1.6.2 | Junio C Hamano | 2009-08-07 | 1 | -3/+8 |
|\ | |||||
| * | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-08-07 | 1 | -3/+8 |
| |\ | |||||
| | * | t5510: harden the way verify-pack is used | Junio C Hamano | 2009-08-07 | 1 | -3/+8 |
| * | | Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1 | Junio C Hamano | 2009-05-03 | 1 | -0/+61 |
| |\ \ | |||||
| * \ \ | Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1 | Junio C Hamano | 2009-05-03 | 1 | -0/+8 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maint-1.6.1 | Junio C Hamano | 2009-05-03 | 2 | -0/+14 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'jc/maint-read-tree-multi' into maint-1.6.2 | Junio C Hamano | 2009-05-12 | 1 | -0/+28 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Revert "checkout branch: prime cache-tree fully" | Junio C Hamano | 2009-05-12 | 1 | -0/+28 |
* | | | | | | | t4018-diff-funcname: add cpp xfuncname pattern to syntax test | Brandon Casey | 2009-05-05 | 1 | -1/+1 |
* | | | | | | | Merge branch 'mk/maint-apply-swap' into maint | Junio C Hamano | 2009-05-03 | 1 | -0/+66 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | tests: make test-apply-criss-cross-rename more robust | Michał Kiedrowicz | 2009-04-20 | 1 | -3/+31 |
| * | | | | | | | builtin-apply: keep information about files to be deleted | Michał Kiedrowicz | 2009-04-20 | 1 | -1/+1 |
| * | | | | | | | tests: test applying criss-cross rename patch | Michał Kiedrowicz | 2009-04-20 | 1 | -0/+38 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'maint-1.6.1' into maint | Junio C Hamano | 2009-04-29 | 1 | -0/+39 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-04-29 | 1 | -0/+39 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | diff -c -p: do not die on submodules | Junio C Hamano | 2009-04-29 | 1 | -0/+39 |
* | | | | | | | Merge branch 'maint-1.6.1' into maint | Junio C Hamano | 2009-04-28 | 1 | -0/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | | | |||||
| * | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-04-28 | 1 | -0/+4 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | grep: fix segfault when "git grep '('" is given | Linus Torvalds | 2009-04-27 | 1 | -0/+4 |
| * | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-04-18 | 1 | -0/+9 |
| |\ \ \ \ \ | | |/ / / / | |||||
* | | | | | | Merge branch 'ef/maint-fast-export' into maint | Junio C Hamano | 2009-04-19 | 1 | -0/+15 |
|\ \ \ \ \ \ | |||||
| * | | | | | | builtin-fast-export.c: handle nested tags | Erik Faye-Lund | 2009-04-19 | 1 | -2/+2 |
| * | | | | | | builtin-fast-export.c: fix crash on tagged trees | Erik Faye-Lund | 2009-04-19 | 1 | -3/+2 |
| * | | | | | | test-suite: adding a test for fast-export with tag variants | Erik Faye-Lund | 2009-04-19 | 1 | -0/+16 |
* | | | | | | | Merge branch 'jc/maint-shared-literally' into maint | Junio C Hamano | 2009-04-19 | 1 | -4/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t1301-shared-repo: fix forced modes test | Johannes Sixt | 2009-04-12 | 1 | -4/+8 |
* | | | | | | | | Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maint | Junio C Hamano | 2009-04-18 | 2 | -0/+14 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | match_tree_entry(): a pathspec only matches at directory boundaries | Junio C Hamano | 2009-04-01 | 1 | -0/+6 |
| * | | | | | | | tree_entry_interesting: a pathspec only matches at directory boundary | Björn Steinbrink | 2009-04-01 | 1 | -0/+8 |
* | | | | | | | | Merge branch 'js/maint-submodule-checkout' into maint | Junio C Hamano | 2009-04-18 | 1 | -0/+42 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix 'git checkout <submodule>' to update the index | Johannes Schindelin | 2009-04-02 | 1 | -0/+42 |
* | | | | | | | | | Merge branch 'cb/maint-merge-recursive-submodule-fix' into maint | Junio C Hamano | 2009-04-18 | 1 | -0/+74 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | update cache for conflicting submodule entries | Clemens Buchacher | 2009-04-05 | 1 | -1/+1 |
| * | | | | | | | | | add tests for merging with submodules | Clemens Buchacher | 2009-04-05 | 1 | -0/+74 |
* | | | | | | | | | | Merge branch 'maint-1.6.0' into maint | Junio C Hamano | 2009-04-18 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
| * | | | | | | | | | init: Do not segfault on big GIT_TEMPLATE_DIR environment variable | Frank Lichtenheld | 2009-04-18 | 1 | -0/+9 |
* | | | | | | | | | | Merge branch 'maint-1.6.1' into maint | Junio C Hamano | 2009-04-17 | 1 | -1/+8 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | / / / | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-04-17 | 1 | -1/+8 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Fix buffer overflow in config parser | Thomas Jarosch | 2009-04-17 | 1 | -1/+8 |
| | | |_|/ / / / | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint-1.6.1 | Junio C Hamano | 2009-04-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | Merge branch 'jc/shared-literally' into maint | Junio C Hamano | 2009-04-08 | 1 | -0/+37 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | t1301: loosen test for forced modes | Jeff King | 2009-04-01 | 1 | -2/+2 |
| * | | | | | | | | "core.sharedrepository = 0mode" should set, not loosen | Junio C Hamano | 2009-03-27 | 1 | -0/+37 |
* | | | | | | | | | Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint | Junio C Hamano | 2009-04-08 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| * | | | | | | | | diff --cached: do not borrow from a work tree when a path is marked as assume... | Junio C Hamano | 2009-03-22 | 1 | -0/+8 |
* | | | | | | | | | Merge branch 'jc/maint-1.6.0-keep-pack' into maint | Junio C Hamano | 2009-04-08 | 1 | -0/+61 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | pack-objects: don't loosen objects available in alternate or kept packs | Brandon Casey | 2009-03-21 | 1 | -1/+1 |
| * | | | | | | | | t7700: demonstrate repack flaw which may loosen objects unnecessarily | Brandon Casey | 2009-03-21 | 1 | -0/+17 |
| * | | | | | | | | pack-objects: only repack or loosen objects residing in "local" packs | Brandon Casey | 2009-03-20 | 1 | -1/+1 |
| * | | | | | | | | git-repack.sh: don't use --kept-pack-only option to pack-objects | Brandon Casey | 2009-03-20 | 1 | -1/+1 |