summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-03-242-2/+2
|\
| * close_sha1_file(): make it easier to diagnose errorsLinus Torvalds2009-03-241-1/+1
| * avoid possible overflow in delta size filtering computationNicolas Pitre2009-03-241-1/+1
* | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-03-221-1/+1
|\ \ | |/
| * everyday: use the dashless form of git-initDavid Aguilar2009-03-221-1/+1
* | Merge branch 'js/maint-1.6.0-path-normalize' into maint-1.6.1Junio C Hamano2009-03-216-152/+115
|\ \
| * | Remove unused normalize_absolute_path()Johannes Sixt2009-02-072-46/+6
| * | Test and fix normalize_path_copy()Johannes Sixt2009-02-073-30/+26
| * | Fix GIT_CEILING_DIRECTORIES on WindowsRené Scharfe2009-02-072-8/+9
| * | Move sanitary_path_copy() to path.c and rename it to normalize_path_copy()Johannes Sixt2009-02-073-87/+88
| * | Make test-path-utils more robust against incorrect useJohannes Sixt2009-02-071-1/+6
* | | Merge branch 'jc/maint-1.6.0-pack-directory' into maint-1.6.1Junio C Hamano2009-03-217-27/+73
|\ \ \
| * | | Fix odb_mkstemp() on AIXMike Ralphson2009-02-261-1/+2
| * | | Make sure objects/pack exists before creating a new packJunio C Hamano2009-02-257-27/+72
* | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-03-124-38/+82
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'ks/maint-1.6.0-mailinfo-folded' into maint-1.6.0Junio C Hamano2009-03-1222-10/+229
| |\ \ \
| * \ \ \ Merge branch 'cc/maint-1.6.0-bisect-fix' into maint-1.6.0Junio C Hamano2009-03-122-36/+73
| |\ \ \ \
| | * | | | bisect: fix another instance of eval'ed stringChristian Couder2009-02-271-1/+7
| | * | | | bisect: fix quoting TRIED revs when "bad" commit is also "skip"pedChristian Couder2009-02-272-35/+66
| | | |/ / | | |/| |
| * | | | Merge branch 'fg/maint-1.6.0-exclude-bq' into maint-1.6.0Junio C Hamano2009-03-122-2/+9
| |\ \ \ \
| | * | | | Support "\" in non-wildcard exclusion entriesFinn Arne Gangstad2009-02-122-2/+9
| | | |_|/ | | |/| |
| * | | | Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into maint-1.6.0Junio C Hamano2009-03-122-66/+98
| |\ \ \ \
* | \ \ \ \ Merge branch 'en/maint-1.6.1-hash-object' into maint-1.6.1Junio C Hamano2009-03-121-2/+2
|\ \ \ \ \ \
| * | | | | | Ensure proper setup of git_dir for git-hash-objectElijah Newren2009-02-281-2/+2
* | | | | | | Merge branch 'js/maint-1.6.1-filter-branch-submodule' into maint-1.6.1Junio C Hamano2009-03-121-1/+1
|\ \ \ \ \ \ \
| * | | | | | | filter-branch: do not consider diverging submodules a 'dirty worktree'Johannes Schindelin2009-02-051-1/+1
* | | | | | | | Merge branch 'gt/maint-1.6.1-utf8-width' into maint-1.6.1Junio C Hamano2009-03-123-5/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | builtin-blame.c: Use utf8_strwidth for author's namesGeoffrey Thomas2009-02-041-5/+7
| * | | | | | | | utf8: add utf8_strwidth()Geoffrey Thomas2009-02-042-0/+20
* | | | | | | | | Merge branch 'js/maint-1.6.1-remote-remove-mirror' into maint-1.6.1Junio C Hamano2009-03-122-7/+58
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | builtin-remote: make rm operation safer in mirrored repositoryJay Soffian2009-02-042-2/+53
| * | | | | | | | | builtin-remote: make rm() use properly named variable to hold return valueJay Soffian2009-02-031-5/+5
* | | | | | | | | | Merge branch 'ek/maint-1.6.1-filter-branch-bare' into maint-1.6.1Junio C Hamano2009-03-122-13/+16
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | filter-branch: Fix fatal error on bare repositoriesEric Kidd2009-02-032-13/+16
* | | | | | | | | | Merge branch 'jc/maint-1.6.1-add-u-remove-conflicted' into maint-1.6.1Junio C Hamano2009-03-122-1/+69
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add -u: do not fail to resolve a path as deletedJunio C Hamano2009-01-282-1/+69
* | | | | | | | | | | Merge branch 'js/maint-1.6.1-rebase-i-submodule' into maint-1.6.1Junio C Hamano2009-03-122-5/+30
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix submodule squashing into unrelated commitJohannes Schindelin2009-01-282-6/+5
| * | | | | | | | | | | rebase -i squashes submodule changes into unrelated commitJunio C Hamano2009-01-281-0/+26
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jc/maint-1.6.1-allow-uninteresting-missing' into maint-1.6.1Junio C Hamano2009-03-122-3/+44
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | revision traversal: allow UNINTERESTING objects to be missingJunio C Hamano2009-01-282-3/+44
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'ks/maint-1.6.0-mailinfo-folded' into maint-1.6.1Junio C Hamano2009-03-1222-10/+229
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | mailinfo: tests for RFC2047 examplesKirill Smelkov2009-01-2814-0/+100
| * | | | | | | | | | mailinfo: add explicit test for mails like '<a.u.thor@example.com> (A U Thor)'Kirill Smelkov2009-01-285-1/+11
| * | | | | | | | | | mailinfo: 'From:' header should be unfold as wellKirill Smelkov2009-01-122-1/+5
| * | | | | | | | | | mailinfo: correctly handle multiline 'Subject:' headerKirill Smelkov2009-01-106-9/+114
* | | | | | | | | | | Merge branch 'jk/maint-1.6.1-cleanup-after-exec-failure' into maint-1.6.1Junio C Hamano2009-03-123-10/+30
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git: use run_command() to execute dashed externalsJeff King2009-01-281-4/+13
| * | | | | | | | | | | run_command(): help callers distinguish errorsJeff King2009-01-281-0/+1
| * | | | | | | | | | | run_command(): handle missing command errors more gracefullyJeff King2009-01-281-4/+14
View Lorry Controller Status