summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sr/transport-helper-fix'Junio C Hamano2011-08-011-0/+9
|\
| * fast-export: support done featureSverre Rabbelier2011-07-191-0/+9
* | Merge branch 'jc/maint-reset-unmerged-path'Junio C Hamano2011-08-011-1/+1
|\ \
| * | reset [<commit>] paths...: do not mishandle unmerged pathsJunio C Hamano2011-07-131-1/+1
* | | Merge branch 'jk/tag-contains-ab'Junio C Hamano2011-07-221-1/+45
|\ \ \
| * | | Revert clock-skew based attempt to optimize tag --contains traversalJunio C Hamano2011-07-142-83/+3
| * | | git skew: a tool to find how big a clock skew exists in the historyJeff King2011-06-301-0/+50
| * | | default core.clockskew variable to one dayJeff King2011-06-111-1/+1
| * | | limit "contains" traversals based on commit timestampJeff King2011-06-111-3/+33
| * | | tag: speed up --contains calculationJeff King2011-06-111-1/+45
* | | | Merge branch 'jc/checkout-reflog-fix'Junio C Hamano2011-07-221-2/+5
|\ \ \ \
| * | | | Merge commit 'v1.7.6' into jc/checkout-reflog-fixJunio C Hamano2011-07-061-2/+5
* | | | | Merge branch 'jc/index-pack'Junio C Hamano2011-07-193-158/+244
|\ \ \ \ \
| * | | | | verify-pack: use index-pack --verifyJunio C Hamano2011-06-051-107/+25
| * | | | | index-pack: show histogram when emulating "verify-pack -v"Junio C Hamano2011-06-051-3/+23
| * | | | | index-pack: start learning to emulate "verify-pack -v"Junio C Hamano2011-06-051-3/+40
| * | | | | index-pack: a miniscule refactorJunio C Hamano2011-06-051-3/+8
| * | | | | index-pack --verify: read anomalous offsets from v2 idx fileJunio C Hamano2011-02-271-0/+48
| * | | | | index-pack: --verifyJunio C Hamano2011-02-271-6/+40
| * | | | | write_idx_file: introduce a struct to hold idx customization optionsJunio C Hamano2011-02-272-19/+24
| * | | | | index-pack: group the delta-base array entries also by typeJunio C Hamano2011-02-271-21/+40
* | | | | | Merge branch 'jk/archive-tar-filter'Junio C Hamano2011-07-192-36/+17
|\ \ \ \ \ \
| * | | | | | upload-archive: allow user to turn off filtersJeff King2011-06-222-2/+2
| * | | | | | archive: move file extension format-guessing lowerJeff King2011-06-222-36/+17
* | | | | | | Merge branch 'jk/clone-cmdline-config'Junio C Hamano2011-07-192-13/+22
|\ \ \ \ \ \ \
| * | | | | | | clone: accept config options on the command lineJeff King2011-06-221-1/+20
| * | | | | | | remote: use new OPT_STRING_LISTJeff King2011-06-221-12/+2
* | | | | | | | Merge branch 'jk/tag-list-multiple-patterns'Junio C Hamano2011-07-191-9/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | tag: accept multiple patterns for --listJeff King2011-06-201-9/+17
* | | | | | | | | Merge branch 'jc/zlib-wrap'Junio C Hamano2011-07-194-17/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | zlib: zlib can only process 4GB at a timeJunio C Hamano2011-06-104-10/+10
| * | | | | | | | | zlib: wrap deflateBound() tooJunio C Hamano2011-06-101-1/+1
| * | | | | | | | | zlib: wrap deflate side of the APIJunio C Hamano2011-06-102-6/+6
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/streaming' into nextJunio C Hamano2011-06-291-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | packed_object_info_detail(): do not return a stringJunio C Hamano2011-05-161-2/+2
| | | | | | | | | |
| | \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \
| *---. \ \ \ \ \ \ \ \ Merge branches 'jc/convert', 'jc/bigfile' and 'jc/replacing' into jc/streamingJunio C Hamano2011-05-153-4/+8
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/grep-color'Junio C Hamano2011-06-291-8/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | grep: add --headingRené Scharfe2011-06-051-0/+2
| * | | | | | | | | | | | | grep: add --breakRené Scharfe2011-06-051-1/+3
| * | | | | | | | | | | | | grep: fix coloring of hunk marks between filesRené Scharfe2011-06-051-7/+16
* | | | | | | | | | | | | | Merge branch 'jc/maint-1.7.3-checkout-describe'Junio C Hamano2011-06-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | checkout -b <name>: correctly detect existing branchJunio C Hamano2011-06-051-1/+1
* | | | | | | | | | | | | | | Merge branch 'jc/advice-about-to-lose-commit'Junio C Hamano2011-06-291-10/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | checkout: make advice when reattaching the HEAD less loudJunio C Hamano2011-05-241-6/+9
* | | | | | | | | | | | | | | Merge branch 'maint-1.7.5' into maintJunio C Hamano2011-06-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | "branch -d" can remove more than one branchesJunio C Hamano2011-06-291-1/+1
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | plug a few coverity-spotted leaksJim Meyering2011-06-203-1/+6
* | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-06-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | / / / / | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | builtin/gc.c: add missing newline in messageAndreas Schwab2011-06-191-1/+1
* | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-06-081-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |