summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/diff-algo-cleanup'Junio C Hamano2012-04-158-25/+24
|\
| * xdiff: PATIENCE/HISTOGRAM are not independent option bitsjc/diff-algo-cleanupJunio C Hamano2012-02-198-20/+24
| * xdiff: remove XDL_PATCH_* macrosJunio C Hamano2012-02-191-5/+0
* | Merge branch 'jc/commit-hook-authorship'Junio C Hamano2012-04-155-47/+141
|\ \
| * | commit: pass author/committer info to hooksjc/commit-hook-authorshipJunio C Hamano2012-03-112-4/+20
| * | t7503: does pre-commit-hook learn authorship?Junio C Hamano2012-03-111-0/+18
| * | ident.c: add split_ident_line() to parse formatted ident lineJunio C Hamano2012-03-113-44/+104
* | | Merge branch 'nd/stream-more'Junio C Hamano2012-04-1511-75/+221
|\ \ \
| * | | update-server-info: respect core.bigfilethresholdnd/stream-moreNguyễn Thái Ngọc Duy2012-03-072-1/+2
| * | | fsck: use streaming API for writing lost-found blobsNguyễn Thái Ngọc Duy2012-03-071-6/+2
| * | | show: use streaming API for showing blobsNguyễn Thái Ngọc Duy2012-03-072-15/+21
| * | | parse_object: avoid putting whole blob in coreNguyễn Thái Ngọc Duy2012-03-072-2/+51
| * | | cat-file: use streaming API to print blobsNguyễn Thái Ngọc Duy2012-03-072-2/+27
| * | | Add more large blob test casesNguyễn Thái Ngọc Duy2012-03-072-5/+60
| * | | streaming: make streaming-write-entry to be more reusableJunio C Hamano2012-03-073-48/+62
* | | | merge overwrites unstaged changes in renamed fileClemens Buchacher2012-04-151-0/+9
* | | | Kick off post 1.7.10 cycleJunio C Hamano2012-04-113-2/+31
* | | | gitweb: Fix unintended "--no-merges" for regular Atom feedSebastian Pipping2012-04-111-0/+1
* | | | Merge branch 'maint'Junio C Hamano2012-04-102-4/+4
|\ \ \ \
| * \ \ \ Merge branch 'maint-1.7.9' into maintJunio C Hamano2012-04-100-0/+0
| |\ \ \ \
| | * \ \ \ Merge branch 'maint-1.7.8' into maint-1.7.9Junio C Hamano2012-04-102-6/+6
| | |\ \ \ \
| | | * \ \ \ Merge branch 'jc/maint-verify-objects-remove-pessimism' into maint-1.7.8Junio C Hamano2012-04-091-4/+4
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'dw/gitweb-doc-grammo' into maint-1.7.8Junio C Hamano2012-04-091-2/+2
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'tr/cache-tree' into maint-1.7.8Junio C Hamano2012-04-0910-11/+142
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'cb/maint-t5541-make-server-port-portable' into maint-1.7.8Junio C Hamano2012-04-092-4/+33
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'cn/maint-rev-list-doc' into maint-1.7.8Junio C Hamano2012-04-091-6/+6
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'tr/maint-bundle-boundary' into maint-1.7.8Junio C Hamano2012-04-092-23/+36
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'tr/maint-bundle-long-subject' into maint-1.7.8Junio C Hamano2012-04-095-51/+67
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'ph/rerere-doc' into maint-1.7.8Junio C Hamano2012-04-091-7/+12
| | | |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | test-subprocess: fix segfault without argumentsRené Scharfe2012-04-101-3/+3
| * | | | | | | | | | | | | | submodule: fix prototype of gitmodules_configRené Scharfe2012-04-101-1/+1
* | | | | | | | | | | | | | | Fix git-subtree install instructionsDavid A. Greene2012-04-091-12/+18
* | | | | | | | | | | | | | | Use git-subtree test MakefileDavid A. Greene2012-04-091-1/+1
* | | | | | | | | | | | | | | Add subtree test MakefileDavid A. Greene2012-04-091-0/+69
* | | | | | | | | | | | | | | Install git-subtree from contribDavid A. Greene2012-04-091-20/+21
* | | | | | | | | | | | | | | Use configure settings for git-subtreeDavid A. Greene2012-04-091-0/+3
* | | | | | | | | | | | | | | Use project config filesDavid A. Greene2012-04-091-3/+6
* | | | | | | | | | | | | | | Remove unnecessary git-subtree filesDavid A. Greene2012-04-096-143/+0
* | | | | | | | | | | | | | | Set TEST_DIRECTORYDavid A. Greene2012-04-091-2/+4
* | | | | | | | | | | | | | | Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb5230361c64946232cc346'David A. Greene2012-04-0915-0/+2196
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Use Test HarnessDavid A. Greene2012-02-111-241/+405
| * | | | | | | | | | | | | | Rename TestDavid A. Greene2012-02-111-0/+0
| * | | | | | | | | | | | | | Move Tests Into SubdirectoryDavid A. Greene2012-02-111-0/+0
| * | | | | | | | | | | | | | Skip commit objects that should be trees, rather than copying them.Avery Pennarun2011-02-281-0/+1
| * | | | | | | | | | | | | | It's also okay if an expected tree object is actually a commit.Avery Pennarun2011-02-281-1/+1
| * | | | | | | | | | | | | | Added check to order of processed commits.Jesse Greenwald2010-11-091-0/+28
| * | | | | | | | | | | | | | Split cmd now processes commits in topo order.Jesse Greenwald2010-11-091-1/+1
| * | | | | | | | | | | | | | Fix a few typos/grammar-o's in the preceding commit.Avery Pennarun2010-10-211-7/+7
| * | | | | | | | | | | | | | docs: Description, synopsys, options and examples changes.John Yani2010-10-211-43/+69
| * | | | | | | | | | | | | | Fixing eval syntax error.Cole Stanfield2010-10-211-1/+1