summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pw/git-p4-move'Junio C Hamano2012-07-153-40/+72
|\
| * git p4: add support for 'p4 move' in P4SubmitGary Gibbons2012-07-122-16/+34
| * git p4: refactor diffOpts calculationGary Gibbons2012-07-052-24/+38
* | Merge branch 'pw/git-p4-jobs'Junio C Hamano2012-07-134-88/+273
|\ \
| * | git p4: notice Jobs lines in git commit messagesPete Wyckoff2012-07-052-6/+195
| * | git p4 test: refactor marshal_dumpPete Wyckoff2012-07-052-5/+13
| * | git p4: remove unused P4Submit interactive settingPete Wyckoff2012-07-051-78/+66
| |/
* | Merge branch 'jk/push-delete-ref-error-message'Junio C Hamano2012-07-131-0/+3
|\ \
| * | push: don't guess at qualifying remote refs on deletionJeff King2012-07-031-0/+3
* | | Sixth batch for 1.7.12Junio C Hamano2012-07-131-0/+33
* | | Merge branch 'jc/refactor-diff-stdin'Junio C Hamano2012-07-134-50/+67
|\ \ \
| * | | diff-index.c: "git diff" has no need to read blob from the standard inputJunio C Hamano2012-06-284-31/+55
| * | | diff-index.c: unify handling of command line pathsJunio C Hamano2012-06-281-16/+11
| * | | diff-index.c: do not pretend paths are pathspecsJunio C Hamano2012-06-281-7/+5
* | | | Merge branch 'tg/ce-namelen'Junio C Hamano2012-07-132-3/+3
|\ \ \ \
| * | | | Replace strlen() with ce_namelen()Thomas Gummerer2012-07-082-3/+3
* | | | | Merge branch 'tb/sanitize-decomposed-utf-8-pathname'Junio C Hamano2012-07-1313-10/+446
|\ \ \ \ \
| * | | | | git on Mac OS and precomposed unicodeTorsten Bögershausen2012-07-0813-10/+446
* | | | | | Merge branch 'mm/mediawiki-tests'Junio C Hamano2012-07-1318-26/+2260
|\ \ \ \ \ \
| * | | | | | git-remote-mediawiki: be more defensive when requests failMatthieu Moy2012-07-061-0/+8
| * | | | | | git-remote-mediawiki: more efficient 'pull' in the best caseMatthieu Moy2012-07-062-21/+110
| * | | | | | git-remote-mediawiki: extract revision-importing loop to a functionMatthieu Moy2012-07-061-3/+13
| * | | | | | git-remote-mediawiki: refactor loop over revision idsMatthieu Moy2012-07-061-6/+11
| * | | | | | git-remote-mediawiki: change return type of get_mw_pagesMatthieu Moy2012-07-061-3/+5
| * | | | | | git-remote-mediawiki (t9363): test 'File:' import and exportNGUYEN Kim Thuat2012-07-061-0/+198
| * | | | | | git-remote-mediawiki: support for uploading file in test environmentMatthieu Moy2012-07-063-1/+21
| * | | | | | git-remote-mediawiki (t9362): test git-remote-mediawiki with UTF8 charactersSimon Cathebras2012-07-061-0/+301
| * | | | | | git-remote-mediawiki (t9361): test git-remote-mediawiki pull and pushGuillaume Sasdy2012-07-062-0/+168
| * | | | | | git-remote-mediawiki (t9360): test git-remote-mediawiki cloneGuillaume Sasdy2012-07-061-0/+257
| * | | | | | git-remote-mediawiki: test environment of git-remote-mediawikiGuillaume Sasdy2012-07-066-0/+556
| * | | | | | git-remote-mediawiki: scripts to install, delete and clear a MediaWikiGuillaume Sasdy2012-07-067-0/+620
* | | | | | | Merge branch 'jn/vcs-svn'Junio C Hamano2012-07-139-43/+31
|\ \ \ \ \ \ \
| * | | | | | | vcs-svn: allow 64-bit Prop-Content-LengthJonathan Nieder2012-07-051-15/+18
| * | | | | | | vcs-svn: suppress a signed/unsigned comparison warningJonathan Nieder2012-07-051-2/+3
| * | | | | | | vcs-svn: suppress a signed/unsigned comparison warningDavid Barr2012-07-051-1/+1
| * | | | | | | vcs-svn: suppress signed/unsigned comparison warningsDavid Barr2012-07-051-2/+2
| * | | | | | | vcs-svn: use strstr instead of memmemDavid Barr2012-07-051-1/+1
| * | | | | | | vcs-svn: use constcmp instead of prefixcmpDavid Barr2012-07-051-1/+1
| * | | | | | | vcs-svn: simplify cleanup in apply_one_windowDavid Barr2012-07-051-4/+4
| * | | | | | | vcs-svn: avoid self-assignment in dummy initialization of pre_offDavid Barr2012-07-051-1/+1
| * | | | | | | vcs-svn: drop no-op reset methodsDavid Barr2012-07-057-16/+0
| * | | | | | | vcs-svn: suppress -Wtype-limits warningJonathan Nieder2012-02-021-3/+3
| * | | | | | | vcs-svn: allow import of > 4GiB filesJonathan Nieder2012-02-023-14/+26
| * | | | | | | vcs-svn: rename check_overflow and its arguments for clarityRamsay Jones2012-02-021-7/+7
* | | | | | | | Merge branch 'mm/mediawiki-file-attachments'Junio C Hamano2012-07-131-64/+386
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | git-remote-mediawiki: improve support for non-English WikisMatthieu Moy2012-07-041-79/+61
| * | | | | | | git-remote-mediawiki: import "File:" attachmentsPavel Volek2012-06-271-8/+249
| * | | | | | | git-remote-mediawiki: split get_mw_pages into smaller functionsMatthieu Moy2012-06-271-44/+62
| * | | | | | | git-remote-mediawiki: send "File:" attachments to a remote wikiNGUYEN Kim Thuat2012-06-271-8/+90
| * | | | | | | git-remote-mediawiki: don't "use encoding 'utf8';"Matthieu Moy2012-06-271-3/+2