summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | fetch: do not leak a refspecJim Meyering2011-06-081-2/+4
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch 'ab/i18n-fixup' into maintJunio C Hamano2011-05-314-20/+32
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/rename-degrade-cc-to-c' into maintJunio C Hamano2011-05-313-4/+21
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/cherry-pick-root-with-resolve' into maintJunio C Hamano2011-05-262-5/+11
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Merge branch 'jk/git-connection-deadlock-fix' into maintJunio C Hamano2011-05-261-0/+2
| * | | | | | | | | | | Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into maintJunio C Hamano2011-05-261-2/+7
* | | | | | | | | | | | Merge branch 'bc/maint-status-z-to-use-porcelain'Junio C Hamano2011-06-061-3/+4
| |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/format-patch-am'Junio C Hamano2011-05-318-28/+25
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | format-patch: preserve subject newlines with -kJeff King2011-05-261-0/+1
| * | | | | | | | | | | clean up calling conventions for pretty.c functionsJeff King2011-05-264-13/+17
| * | | | | | | | | | | pretty: add pp_commit_easy function for simple callersJeff King2011-05-265-12/+5
| * | | | | | | | | | | mailinfo: always clean up rfc822 header foldingJeff King2011-05-261-1/+1
* | | | | | | | | | | | Merge branch 'jc/log-quiet-fix'Junio C Hamano2011-05-311-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | log: --quiet should serve as synonym to -sJunio C Hamano2011-05-281-0/+2
* | | | | | | | | | | | | Merge branch 'jk/maint-remote-mirror-safer'Junio C Hamano2011-05-311-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | remote: allow "-t" with fetch mirrorsJeff King2011-05-261-2/+2
* | | | | | | | | | | | | | Merge branch 'jl/read-tree-m-dry-run'Junio C Hamano2011-05-311-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Teach read-tree the -n|--dry-run optionJens Lehmann2011-05-251-1/+2
* | | | | | | | | | | | | | | Merge branch 'mk/grep-pcre'Junio C Hamano2011-05-301-9/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git-grep: do not die upon -F/-P when grep.extendedRegexp is set.Junio C Hamano2011-05-091-13/+43
| * | | | | | | | | | | | | | | git-grep: Bail out when -P is used with -F or -EMichał Kiedrowicz2011-05-091-1/+3
| * | | | | | | | | | | | | | | git-grep: Learn PCREMichał Kiedrowicz2011-05-091-0/+2
* | | | | | | | | | | | | | | | Merge branch 'jc/notes-batch-removal'Junio C Hamano2011-05-292-22/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | show: --ignore-missingJunio C Hamano2011-05-191-0/+1
| * | | | | | | | | | | | | | | | notes remove: --stdin reads from the standard inputJunio C Hamano2011-05-191-4/+15
| * | | | | | | | | | | | | | | | notes remove: --ignore-missingJunio C Hamano2011-05-191-4/+10
| * | | | | | | | | | | | | | | | notes remove: allow removing more than oneJunio C Hamano2011-05-191-22/+25
* | | | | | | | | | | | | | | | | Merge branch 'jk/haves-from-alternate-odb'Junio C Hamano2011-05-292-4/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | receive-pack: eliminate duplicate .have refsJeff King2011-05-191-3/+13
View Lorry Controller Status