summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t0000-basic: Add ls-tree recursive test back.Junio C Hamano2006-04-261-0/+21
* Merge branch 'jc/diff'Junio C Hamano2006-04-259-2136/+2111
|\
| * Libified diff-index: backward compatibility fix.Junio C Hamano2006-04-223-6/+12
| * Libify diff-index.Junio C Hamano2006-04-224-238/+231
| * Libify diff-files.Junio C Hamano2006-04-227-1953/+1929
* | Makefile: remove and create libgit.a from scratch.Junio C Hamano2006-04-251-1/+1
* | Merge branch 'fix'Junio C Hamano2006-04-245-17/+212
|\ \
| * | Document the configuration filePetr Baudis2006-04-243-14/+198
| * | Document git-var -l listing also configuration variablesPetr Baudis2006-04-241-1/+4
| * | rev-parse: better error message for ambiguous argumentsPaul Mackerras2006-04-241-2/+10
* | | Merge branch 'ar/chmod-series'Junio C Hamano2006-04-241-7/+16
|\ \ \
| * | | make update-index --chmod work with multiple files and --stdinAlex Riesen2006-04-231-7/+16
| | |/ | |/|
* | | Merge branch 'sh/daemon'Junio C Hamano2006-04-241-1/+1
|\ \ \
| * | | socksetup: don't return on set_reuse_addr() errorSerge E. Hallyn2006-04-181-1/+1
* | | | Merge branch 'jc/cc-stat'Junio C Hamano2006-04-241-1/+2
|\ \ \ \
| * | | | Fix "git show --stat"Junio C Hamano2006-04-211-1/+2
| | |/ / | |/| |
* | | | Merge branch 'jc/unresolve'Junio C Hamano2006-04-241-0/+127
|\ \ \ \
| * | | | git-update-index --unresolveJunio C Hamano2006-04-194-149/+128
| * | | | Add git-unresolve <paths>...Junio C Hamano2006-04-193-1/+149
* | | | | Merge branch 'jc/color'Junio C Hamano2006-04-242-0/+198
|\ \ \ \ \
| * | | | | Add colordiff for git to contrib/colordiff.Junio C Hamano2006-04-212-0/+198
| | |/ / / | |/| | |
* | | | | Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2006-04-241-18/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | gitk: Let git-rev-list do the argument list parsingPaul Mackerras2006-04-231-18/+2
* | | | | Merge branch 'jc/diff'Junio C Hamano2006-04-211-9/+68
|\ \ \ \ \
| * | | | | diff --stat: do not drop rename information.Junio C Hamano2006-04-191-9/+68
| | |/ / / | |/| | |
* | | | | Makefile: dependency for builtin-help.oJunio C Hamano2006-04-211-0/+2
* | | | | Split up builtin commands into separate files from git.cLinus Torvalds2006-04-215-305/+342
* | | | | Merge branch 'fix'Junio C Hamano2006-04-211-0/+2
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | git-log produces no outputLinus Torvalds2006-04-211-0/+2
* | | | | Merge branch 'fix'Junio C Hamano2006-04-213-8/+12
|\ \ \ \ \ | |/ / / /
| * | | | fix pack-object buffer sizeNicolas Pitre2006-04-211-1/+1
| * | | | mailinfo: decode underscore used in "Q" encoding properly.Junio C Hamano2006-04-211-5/+7
| * | | | Reintroduce svn pools to solve the memory leak.Santi_BĂ©jar2006-04-201-1/+3
| * | | | pack-objects: do not stop at object that is "too small"Junio C Hamano2006-04-201-1/+1
* | | | | Merge branch 'fix'Junio C Hamano2006-04-202-7/+16
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | git-commit --amend: two fixes.Junio C Hamano2006-04-202-7/+16
* | | | Merge branch 'lt/xsha1'Junio C Hamano2006-04-193-1/+67
|\ \ \ \
| * | | | get_tree_entry(): make it available from tree-walkJunio C Hamano2006-04-193-52/+52
| * | | | sha1_name.c: no need to include diff.h; tree-walk.h will do.Junio C Hamano2006-04-191-1/+1
| * | | | sha1_name.c: prepare to make get_tree_entry() reusable from others.Junio C Hamano2006-04-191-9/+10
| * | | | get_sha1() shorthands for blob/tree objectsLinus Torvalds2006-04-181-1/+66
* | | | | Merge branch 'maint'Junio C Hamano2006-04-192-1/+4
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | pre-commit hook: complain about conflict markers.Junio C Hamano2006-04-191-0/+3
| * | | | git-merge: a bit more readable user guidance.Junio C Hamano2006-04-191-1/+1
* | | | | diff: move diff.c to diff-lib.c to make room.Junio C Hamano2006-04-192-1/+1
* | | | | git log: don't do merge diffs by defaultLinus Torvalds2006-04-191-2/+0
* | | | | Allow "git repack" users to specify repacking window/depthLinus Torvalds2006-04-191-3/+5
* | | | | Merge branch 'fix'Junio C Hamano2006-04-192-4/+24
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Document git-clone --referenceShawn Pearce2006-04-181-1/+20
| * | | Fix filename scaling for binary filesJonas Fonseca2006-04-181-3/+4