summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Teach "diff --check" about new blank lines at endJunio C Hamano2008-06-264-2/+37
* checkdiff: pass diff_options to the callbackJunio C Hamano2008-06-261-10/+11
* check_and_emit_line(): rename and refactorJunio C Hamano2008-06-264-16/+25
* diff --check: explain why we do not care whether old side is binaryJunio C Hamano2008-06-261-2/+9
* Merge branch 'maint'Junio C Hamano2008-06-265-7/+80
|\
| * Merge branch 'maint-1.5.5' into maintJunio C Hamano2008-06-263-4/+67
| |\
| | * GIT 1.5.5.5v1.5.5.5Junio C Hamano2008-06-263-2/+13
| | * Merge branch 'maint-1.5.4' into maint-1.5.5Junio C Hamano2008-06-262-4/+56
| | |\
| | | * GIT 1.5.4.6v1.5.4.6Junio C Hamano2008-06-263-2/+45
| | | * git-shell: accept "git foo" formJunio C Hamano2008-06-261-4/+13
| * | | diff --check: do not discard error status upon seeing a good lineJunio C Hamano2008-06-262-3/+13
* | | | improve for-each-ref test scriptJeff King2008-06-261-17/+70
* | | | Add 'git-p4.allowSubmit' to git-p4Jing Xue2008-06-261-0/+4
* | | | Start draft release notes for 1.6.0Junio C Hamano2008-06-262-1/+106
* | | | update-hook-example: optionally allow non-fast-forwardDmitry Potapov2008-06-251-33/+53
* | | | Merge branch 'maint'Junio C Hamano2008-06-256-11/+53
|\ \ \ \ | |/ / /
| * | | GIT 1.5.6.1v1.5.6.1Junio C Hamano2008-06-253-6/+35
| * | | fix update-hook-example to work with packed tag referencesDmitry Potapov2008-06-251-1/+1
| * | | clone: create intermediate directories of destination repoJeff King2008-06-255-11/+39
| * | | Merge branch 'jc/maint-combine-diff-pre-context' into maintJunio C Hamano2008-06-251-2/+5
| |\ \ \
| * \ \ \ Merge branch 'lt/maint-gitdir-relative' into maintJunio C Hamano2008-06-253-1/+20
| |\ \ \ \
| * \ \ \ \ Merge branch 'sb/maint-rebase' into maintJunio C Hamano2008-06-251-4/+10
| |\ \ \ \ \
| | * | | | | git-rebase.sh: Add check if rebase is in progressStephan Beyer2008-06-221-4/+10
| * | | | | | for-each-ref: implement missing tag valuesJeff King2008-06-251-0/+7
* | | | | | | Fix use of "perl -i" on WindowsAlex Riesen2008-06-253-8/+8
* | | | | | | Merge branch 'sb/rebase'Junio C Hamano2008-06-251-9/+34
|\ \ \ \ \ \ \
| * | | | | | | t3404: stricter tests for git-rebase--interactiveStephan Beyer2008-06-221-9/+34
| * | | | | | | api-builtin.txt: update and fix typoStephan Beyer2008-06-221-5/+10
* | | | | | | | Merge branch 'lw/gitweb'Junio C Hamano2008-06-251-106/+105
|\ \ \ \ \ \ \ \
| * | | | | | | | gitweb: standarize HTTP status codesLea Wiemann2008-06-191-106/+105
* | | | | | | | | Merge branch 'lt/config-fsync'Junio C Hamano2008-06-255-21/+74
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add config option to enable 'fsync()' of object filesLinus Torvalds2008-06-185-1/+17
| * | | | | | | | | Split up default "i18n" and "branch" config parsing into helper routinesLinus Torvalds2008-06-181-11/+29
| * | | | | | | | | Split up default "user" config parsing into helper routineLinus Torvalds2008-06-181-4/+13
| * | | | | | | | | Split up default "core" config parsing into helper routineLinus Torvalds2008-06-181-16/+26
| |/ / / / / / / /
* | | | | | | | | Merge branch 'sr/tests'Junio C Hamano2008-06-253-4/+57
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Hook up the result aggregation in the test makefile.Sverre Rabbelier2008-06-081-2/+8
| * | | | | | | | | A simple script to parse the results from the testcasesMiklos Vajna2008-06-081-0/+34
| * | | | | | | | | Modify test-lib.sh to output stats to t/test-results/*Sverre Rabbelier2008-06-082-2/+15
* | | | | | | | | | Merge branch 'jh/clone-packed-refs'Junio C Hamano2008-06-257-125/+151
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Teach "git clone" to pack refsJohan Herland2008-06-191-2/+6
| * | | | | | | | | | Prepare testsuite for a "git clone" that packs refsJohan Herland2008-06-191-3/+6
| * | | | | | | | | | Move pack_refs() and friends into libgitJohan Herland2008-06-194-120/+138
| * | | | | | | | | | Incorporate fetched packs in future object traversalJohan Herland2008-06-191-0/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'lw/perlish'Junio C Hamano2008-06-253-0/+197
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Git.pm: add test suiteLea Wiemann2008-06-192-0/+139
| * | | | | | | | | | t/test-lib.sh: add test_external and test_external_without_stderrLea Wiemann2008-06-191-0/+58
* | | | | | | | | | | verify-pack: test for detection of index v2 object CRC mismatchNicolas Pitre2008-06-241-0/+14
* | | | | | | | | | | verify-pack: check packed object CRC when using index version 2Nicolas Pitre2008-06-243-25/+38
* | | | | | | | | | | move show_pack_info() where it belongsNicolas Pitre2008-06-246-70/+67