summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2010-01-101-13/+13
|\
| * branch: die explicitly why when calling "git branch [-a|-r] branchname".Matthieu Moy2009-12-311-13/+13
* | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-12-291-7/+7
|\ \ | |/
| * t7102: make the test fail if one of its check failsNguyễn Thái Ngọc Duy2009-12-291-7/+7
| * Merge branch 'maint-1.5.6' into maint-1.6.0Junio C Hamano2009-08-271-0/+39
| |\
* | \ Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-08-071-3/+8
|\ \ \ | |/ /
| * | t5510: harden the way verify-pack is usedJunio C Hamano2009-08-071-3/+8
* | | Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1Junio C Hamano2009-05-031-0/+61
|\ \ \
| * | | pack-objects: don't loosen objects available in alternate or kept packsBrandon Casey2009-03-211-1/+1
| * | | t7700: demonstrate repack flaw which may loosen objects unnecessarilyBrandon Casey2009-03-211-0/+17
| * | | pack-objects: only repack or loosen objects residing in "local" packsBrandon Casey2009-03-201-1/+1
| * | | git-repack.sh: don't use --kept-pack-only option to pack-objectsBrandon Casey2009-03-201-1/+1
| * | | t7700-repack: add two new tests demonstrating repacking flawsBrandon Casey2009-03-201-0/+44
* | | | Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1Junio C Hamano2009-05-031-0/+8
|\ \ \ \
| * | | | diff --cached: do not borrow from a work tree when a path is marked as assume...Junio C Hamano2009-03-221-0/+8
* | | | | Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maint-1.6.1Junio C Hamano2009-05-032-0/+14
|\ \ \ \ \
| * | | | | match_tree_entry(): a pathspec only matches at directory boundariesJunio C Hamano2009-04-011-0/+6
| * | | | | tree_entry_interesting: a pathspec only matches at directory boundaryBjörn Steinbrink2009-04-011-0/+8
* | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-291-0/+39
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | diff -c -p: do not die on submodulesJunio C Hamano2009-04-291-0/+39
* | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-281-0/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | grep: fix segfault when "git grep '('" is givenLinus Torvalds2009-04-271-0/+4
* | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-181-0/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | init: Do not segfault on big GIT_TEMPLATE_DIR environment variableFrank Lichtenheld2009-04-181-0/+9
* | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-171-1/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix buffer overflow in config parserThomas Jarosch2009-04-171-1/+8
| |/ / / /
* | | | | Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint-1.6.1Junio C Hamano2009-04-081-1/+1
|\ \ \ \ \
| * | | | | git-branch: display "was sha1" on branch deletion rather than just "sha1"Brandon Casey2009-03-211-1/+1
* | | | | | test-lib: Clean up comments and Makefile.Emil Sit2009-03-282-9/+1
* | | | | | Merge branch 'js/maint-1.6.0-path-normalize' into maint-1.6.1Junio C Hamano2009-03-212-19/+20
|\ \ \ \ \ \
| * | | | | | Test and fix normalize_path_copy()Johannes Sixt2009-02-071-16/+17
| * | | | | | Fix GIT_CEILING_DIRECTORIES on WindowsRené Scharfe2009-02-071-3/+3
* | | | | | | Merge branch 'jc/maint-1.6.0-pack-directory' into maint-1.6.1Junio C Hamano2009-03-211-0/+17
|\ \ \ \ \ \ \
| * | | | | | | Make sure objects/pack exists before creating a new packJunio C Hamano2009-02-251-0/+17
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-03-122-1/+33
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'ks/maint-1.6.0-mailinfo-folded' into maint-1.6.0Junio C Hamano2009-03-1221-2/+209
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'cc/maint-1.6.0-bisect-fix' into maint-1.6.0Junio C Hamano2009-03-121-0/+25
| |\ \ \ \ \ \ \
| | * | | | | | | bisect: fix quoting TRIED revs when "bad" commit is also "skip"pedChristian Couder2009-02-271-0/+25
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge branch 'fg/maint-1.6.0-exclude-bq' into maint-1.6.0Junio C Hamano2009-03-121-1/+8
| |\ \ \ \ \ \ \
| | * | | | | | | Support "\" in non-wildcard exclusion entriesFinn Arne Gangstad2009-02-121-1/+8
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into maint-1.6.0Junio C Hamano2009-03-121-0/+18
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'js/maint-1.6.1-remote-remove-mirror' into maint-1.6.1Junio C Hamano2009-03-121-0/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | builtin-remote: make rm operation safer in mirrored repositoryJay Soffian2009-02-041-0/+26
* | | | | | | | | Merge branch 'ek/maint-1.6.1-filter-branch-bare' into maint-1.6.1Junio C Hamano2009-03-121-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | filter-branch: Fix fatal error on bare repositoriesEric Kidd2009-02-031-1/+3
* | | | | | | | | | Merge branch 'jc/maint-1.6.1-add-u-remove-conflicted' into maint-1.6.1Junio C Hamano2009-03-121-1/+49
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add -u: do not fail to resolve a path as deletedJunio C Hamano2009-01-281-1/+49
* | | | | | | | | | | Merge branch 'js/maint-1.6.1-rebase-i-submodule' into maint-1.6.1Junio C Hamano2009-03-121-0/+26
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix submodule squashing into unrelated commitJohannes Schindelin2009-01-281-1/+1
| * | | | | | | | | | | rebase -i squashes submodule changes into unrelated commitJunio C Hamano2009-01-281-0/+26
| |/ / / / / / / / / /