summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/zlib-wrap' into maintJunio C Hamano2011-08-1615-124/+321
|\
| * zlib: allow feeding more than 4GB in one goJunio C Hamano2011-06-101-20/+58
| * zlib: zlib can only process 4GB at a timeJunio C Hamano2011-06-1015-70/+142
| * zlib: wrap deflateBound() tooJunio C Hamano2011-06-108-10/+17
| * zlib: wrap deflate side of the APIJunio C Hamano2011-06-1010-41/+105
| * zlib: wrap inflateInit2 used to accept only for gzip formatJunio C Hamano2011-06-103-4/+17
| * zlib: wrap remaining calls to direct inflate/inflateEndJunio C Hamano2011-06-101-2/+2
| * zlib wrapper: refactor error message formatterJunio C Hamano2011-06-101-35/+38
* | Merge branch 'fk/relink-upon-ldflags-update' into maintJunio C Hamano2011-08-162-8/+18
|\ \
| * | Makefile: Track changes to LDFLAGS and relink when necessaryFredrik Kuivinen2011-06-222-8/+18
* | | Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4' into maintJunio C Hamano2011-08-162-1/+23
|\ \ \
| * | | git-submodule.sh: preserve stdin for the command spawned by foreachBrandon Casey2011-06-292-3/+7
| * | | t/t7407: demonstrate that the command called by 'submodule foreach' loses stdinBrandon Casey2011-06-291-0/+18
* | | | Merge branch 'aw/rebase-i-p' into maintJunio C Hamano2011-08-164-5/+30
|\ \ \ \
| * | | | rebase -i -p: include non-first-parent commits in todo listAndrew Wong2011-06-194-5/+30
* | | | | Merge branch 'jc/diff-index-quick-exit-early' into maintJunio C Hamano2011-08-163-2/+10
|\ \ \ \ \
| * | | | | diff-index --quiet: learn the "stop feeding the backend early" logicJunio C Hamano2011-05-313-2/+10
| * | | | | Merge remote-tracking branch 'ko/maint' into jc/diff-index-quick-exit-earlyJunio C Hamano2011-05-311452-35445/+144356
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'jk/combine-diff-binary-etc' into maintJunio C Hamano2011-08-165-83/+376
|\ \ \ \ \ \ \
| * | | | | | | combine-diff: respect textconv attributesJeff King2011-05-242-9/+131
| * | | | | | | refactor get_textconv to not require diff_filespecJeff King2011-05-233-13/+20
| * | | | | | | combine-diff: handle binary files as binaryJeff King2011-05-232-2/+148
| * | | | | | | combine-diff: calculate mode_differs earlierJeff King2011-05-231-2/+7
| * | | | | | | combine-diff: split header printing into its own functionJeff King2011-05-231-61/+74
* | | | | | | | am: refresh the index at start and --resolvedJeff King2011-08-161-0/+2
* | | | | | | | filter-branch: Export variable `workdir' for --commit-filterMichael Witten2011-08-081-1/+1
* | | | | | | | Documentation/Makefile: add *.pdf to `clean' targetEmilio G. Cota2011-08-081-0/+1
* | | | | | | | Documentation: ignore *.pdf filesEmilio G. Cota2011-08-081-0/+1
* | | | | | | | add gitignore entry to description about how to write a builtinHeiko Voigt2011-08-031-0/+2
* | | | | | | | gitattributes: Reword "attribute macro" to "macro attribute"Michael Haggerty2011-08-031-9/+9
* | | | | | | | gitattributes: Clarify discussion of attribute macrosMichael Haggerty2011-08-031-5/+8
* | | | | | | | Merge branch 'nk/ref-doc' into maintJunio C Hamano2011-08-014-30/+34
|\ \ \ \ \ \ \ \
| * | | | | | | | glossary: clarify description of HEADJunio C Hamano2011-06-231-2/+2
| * | | | | | | | glossary: update description of head and refJunio C Hamano2011-06-231-4/+5
| * | | | | | | | glossary: update description of "tag"Junio C Hamano2011-06-231-8/+8
| * | | | | | | | git.txt: de-emphasize the implementation detail of a refJunio C Hamano2011-06-231-4/+3
| * | | | | | | | check-ref-format doc: de-emphasize the implementation detail of a refJunio C Hamano2011-06-231-3/+6
| * | | | | | | | git-remote.txt: avoid sounding as if loose refs are the only ones in the worldJunio C Hamano2011-06-231-9/+10
| * | | | | | | | git-remote.txt: fix wrong remote refspecNamhyung Kim2011-06-231-6/+6
* | | | | | | | | Merge branch 'jl/maint-fetch-recursive-fix' into maintJunio C Hamano2011-08-012-8/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fetch: Also fetch submodules in subdirectories in on-demand modeJens Lehmann2011-06-202-8/+9
* | | | | | | | | | Merge branch 'jc/maint-cygwin-trust-executable-bit-default' into maintJunio C Hamano2011-08-011-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | cygwin: trust executable bit by defaultJunio C Hamano2011-06-201-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'jc/legacy-loose-object' into maintJunio C Hamano2011-08-011-29/+33
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | sha1_file.c: "legacy" is really the current formatJunio C Hamano2011-06-081-29/+33
* | | | | | | | | | | Merge branch 'an/shallow-doc' into maintJunio C Hamano2011-08-011-29/+74
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Document the underlying protocol used by shallow repositories and --depth com...Alex Neronskiy2011-06-081-22/+66
| * | | | | | | | | | | Fix documentation of fetch-pack that implies that the client can disconnect a...Alex Neronskiy2011-06-081-14/+15
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jc/maint-1.7.3-checkout-describe' into maintJunio C Hamano2011-08-014-1/+19
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | checkout -b <name>: correctly detect existing branchJunio C Hamano2011-06-054-1/+19
View Lorry Controller Status