Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2010-01-10 | 1 | -13/+13 |
|\ | |||||
| * | branch: die explicitly why when calling "git branch [-a|-r] branchname". | Matthieu Moy | 2009-12-31 | 1 | -13/+13 |
* | | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-12-29 | 1 | -7/+7 |
|\ \ | |/ | |||||
| * | t7102: make the test fail if one of its check fails | Nguyễn Thái Ngọc Duy | 2009-12-29 | 1 | -7/+7 |
| * | Merge branch 'maint-1.5.6' into maint-1.6.0 | Junio C Hamano | 2009-08-27 | 1 | -0/+39 |
| |\ | |||||
* | \ | 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 |
|\ \ \ | |||||
| * | | | 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 |
| * | | | t7700-repack: add two new tests demonstrating repacking flaws | Brandon Casey | 2009-03-20 | 1 | -0/+44 |
* | | | | Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1 | Junio C Hamano | 2009-05-03 | 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 'bs/maint-1.6.0-tree-walk-prefix' into maint-1.6.1 | Junio C Hamano | 2009-05-03 | 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 '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.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 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | init: Do not segfault on big GIT_TEMPLATE_DIR environment variable | Frank Lichtenheld | 2009-04-18 | 1 | -0/+9 |
* | | | | | | 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 |
|\ \ \ \ \ | |||||
| * | | | | | git-branch: display "was sha1" on branch deletion rather than just "sha1" | Brandon Casey | 2009-03-21 | 1 | -1/+1 |
* | | | | | | test-lib: Clean up comments and Makefile. | Emil Sit | 2009-03-28 | 2 | -9/+1 |
* | | | | | | Merge branch 'js/maint-1.6.0-path-normalize' into maint-1.6.1 | Junio C Hamano | 2009-03-21 | 2 | -19/+20 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Test and fix normalize_path_copy() | Johannes Sixt | 2009-02-07 | 1 | -16/+17 |
| * | | | | | | Fix GIT_CEILING_DIRECTORIES on Windows | René Scharfe | 2009-02-07 | 1 | -3/+3 |
* | | | | | | | Merge branch 'jc/maint-1.6.0-pack-directory' into maint-1.6.1 | Junio C Hamano | 2009-03-21 | 1 | -0/+17 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Make sure objects/pack exists before creating a new pack | Junio C Hamano | 2009-02-25 | 1 | -0/+17 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-03-12 | 2 | -1/+33 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Merge branch 'ks/maint-1.6.0-mailinfo-folded' into maint-1.6.0 | Junio C Hamano | 2009-03-12 | 21 | -2/+209 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'cc/maint-1.6.0-bisect-fix' into maint-1.6.0 | Junio C Hamano | 2009-03-12 | 1 | -0/+25 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | bisect: fix quoting TRIED revs when "bad" commit is also "skip"ped | Christian Couder | 2009-02-27 | 1 | -0/+25 |
| | | |/ / / / / | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'fg/maint-1.6.0-exclude-bq' into maint-1.6.0 | Junio C Hamano | 2009-03-12 | 1 | -1/+8 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Support "\" in non-wildcard exclusion entries | Finn Arne Gangstad | 2009-02-12 | 1 | -1/+8 |
| | | |_|/ / / / | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into maint-1.6.0 | Junio C Hamano | 2009-03-12 | 1 | -0/+18 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'js/maint-1.6.1-remote-remove-mirror' into maint-1.6.1 | Junio C Hamano | 2009-03-12 | 1 | -0/+26 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | builtin-remote: make rm operation safer in mirrored repository | Jay Soffian | 2009-02-04 | 1 | -0/+26 |
* | | | | | | | | | Merge branch 'ek/maint-1.6.1-filter-branch-bare' into maint-1.6.1 | Junio C Hamano | 2009-03-12 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | filter-branch: Fix fatal error on bare repositories | Eric Kidd | 2009-02-03 | 1 | -1/+3 |
* | | | | | | | | | | Merge branch 'jc/maint-1.6.1-add-u-remove-conflicted' into maint-1.6.1 | Junio C Hamano | 2009-03-12 | 1 | -1/+49 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | add -u: do not fail to resolve a path as deleted | Junio C Hamano | 2009-01-28 | 1 | -1/+49 |
* | | | | | | | | | | | Merge branch 'js/maint-1.6.1-rebase-i-submodule' into maint-1.6.1 | Junio C Hamano | 2009-03-12 | 1 | -0/+26 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fix submodule squashing into unrelated commit | Johannes Schindelin | 2009-01-28 | 1 | -1/+1 |
| * | | | | | | | | | | | rebase -i squashes submodule changes into unrelated commit | Junio C Hamano | 2009-01-28 | 1 | -0/+26 |
| |/ / / / / / / / / / |