summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | Merge branch 'js/maint-add-path-stat-pwd' into maintJunio C Hamano2011-08-161-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | get_pwd_cwd(): Do not trust st_dev/st_ino blindlyJohannes Schindelin2011-07-111-1/+2
* | | | | | | | | | | | | | | Merge branch 'ms/help-unknown' into maintJunio C Hamano2011-08-161-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | help_unknown_cmd: do not propose an "unknown" cmdMichael Schubert2011-07-081-0/+12
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'mz/doc-synopsis-verse' into maintJunio C Hamano2011-08-1693-6/+92
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Documentation: use [verse] for SYNOPSIS sectionsMartin von Zweigbergk2011-07-0693-6/+92
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jn/mime-type-with-params' into maintJunio C Hamano2011-08-161-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | gitweb: Serve */*+xml 'blob_plain' as text/plain with $prevent_xssJakub Narebski2011-06-301-1/+2
| * | | | | | | | | | | | | | | gitweb: Serve text/* 'blob_plain' as text/plain with $prevent_xssJakub Narebski2011-06-301-1/+9
* | | | | | | | | | | | | | | | Merge branch 'jc/submodule-sync-no-auto-vivify' into maintJunio C Hamano2011-08-163-30/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | submodule add: always initialize .git/config entryJens Lehmann2011-06-261-17/+18
| * | | | | | | | | | | | | | | | submodule sync: do not auto-vivify uninteresting submoduleJunio C Hamano2011-06-263-13/+29
* | | | | | | | | | | | | | | | | 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