summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jn/block-sha1'Junio C Hamano2012-07-232-7/+6
|\
| * Makefile: BLK_SHA1 does not require fast htonl() and unaligned loadsJonathan Nieder2012-07-231-3/+2
| * block-sha1: put expanded macro parameters in parenthesesJonathan Nieder2012-07-221-2/+2
| * block-sha1: avoid pointer conversion that violates alignment constraintsJonathan Nieder2012-07-221-3/+3
* | Merge branch 'jn/make-assembly-in-right-directory'Junio C Hamano2012-07-231-1/+1
|\ \
| * | Makefile: fix location of listing produced by "make subdir/foo.s"Jonathan Nieder2012-07-221-1/+1
* | | Merge branch 'th/difftool-diffall'Junio C Hamano2012-07-231-2/+5
|\ \ \
| * | | difftool: only copy back files modified during directory diffTim Henigan2012-07-191-2/+5
* | | | Merge branch 'sl/autoconf'Junio C Hamano2012-07-232-27/+46
|\ \ \ \
| * | | | build: reconfigure automatically if configure.ac changesStefano Lattarini2012-07-192-0/+14
| * | | | build: "make clean" should not remove configure-generated filesStefano Lattarini2012-07-191-2/+3
| * | | | autoconf: use AC_CONFIG_COMMANDS instead of ad-hoc 'config.mak.append'Stefano Lattarini2012-07-191-11/+17
| * | | | autoconf: remove few redundant semicolonsStefano Lattarini2012-07-191-2/+2
| * | | | autoconf: remove some redundant shell indirectionsStefano Lattarini2012-07-191-7/+5
| * | | | autoconf: GIT_CONF_APPEND_LINE -> GIT_CONF_SUBSTStefano Lattarini2012-07-191-12/+12
| * | | | autoconf: GIT_CONF_APPEND_LINE: change signatureStefano Lattarini2012-07-191-14/+14
* | | | | Merge branch 'jv/maint-no-ext-diff'Junio C Hamano2012-07-232-3/+64
|\ \ \ \ \
| * | | | | diff: test precedence of external diff driversJeff King2012-07-191-0/+40
| * | | | | diff: correctly disable external_diff with --no-ext-diffJunio C Hamano2012-07-172-3/+24
| | |_|/ / | |/| | |
* | | | | Merge branch 'kk/maint-commit-tree'Junio C Hamano2012-07-233-4/+18
|\ \ \ \ \
| * | | | | Revert "git-commit-tree(1): update synopsis"Junio C Hamano2012-07-171-1/+1
| * | | | | Merge branch 'kk/maint-1.7.9-commit-tree' into kk/maint-commit-treeJunio C Hamano2012-07-172-3/+17
| |\ \ \ \ \
| | * | | | | commit-tree: resurrect command line parsing updatesJunio C Hamano2012-07-172-3/+17
* | | | | | | Merge branch 'jk/mediawiki-credential'Junio C Hamano2012-07-233-34/+22
|\ \ \ \ \ \ \
| * | | | | | | mw-to-git: use git-credential's URL parserJeff King2012-07-181-28/+4
| * | | | | | | credential: convert "url" attribute into its parsed subpartsJeff King2012-07-182-0/+14
| * | | | | | | mw-to-git: check blank credential attributes via lengthJeff King2012-07-181-1/+1
| * | | | | | | docs/credential: minor clarity fixupsJeff King2012-07-181-6/+4
* | | | | | | | Merge branch 'mm/mediawiki-usability'Junio C Hamano2012-07-233-32/+116
|\ \ \ \ \ \ \ \
| * | | | | | | | git-remote-mediawiki: allow page names with a ':'Matthieu Moy2012-07-172-16/+53
| * | | | | | | | git-remote-mediawiki: fix incorrect test usage in testMatthieu Moy2012-07-171-1/+1
| * | | | | | | | git-remote-mediawiki: properly deal with invalid remote revisionsMatthieu Moy2012-07-161-4/+9
| * | | | | | | | git-remote-mediawiki: show progress information when getting last remote revi...Matthieu Moy2012-07-161-0/+2
| * | | | | | | | git-remote-mediawiki: show progress information when listing pagesMatthieu Moy2012-07-161-0/+3
| * | | | | | | | git-remote-mediawiki: use --force when adding notesMatthieu Moy2012-07-161-1/+1
| * | | | | | | | git-remote-mediawiki: get rid of O(N^2) loopMatthieu Moy2012-07-161-7/+17
| * | | | | | | | git-remote-mediawiki: make mediafiles export optionalMatthieu Moy2012-07-161-2/+22
| * | | | | | | | git-remote-mediawiki: actually send empty comment when they're emptyMatthieu Moy2012-07-161-1/+8
| * | | | | | | | git-remote-mediawiki: don't split namespaces with spacesMatthieu Moy2012-07-161-1/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'sn/doc-typofix'Junio C Hamano2012-07-235-10/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | doc: A few minor copy edits.Štěpán Němec2012-07-145-10/+10
* | | | | | | | | Merge branch 'tg/ce-namelen-field'Junio C Hamano2012-07-238-52/+65
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Strip namelen out of ce_flags into a ce_namelen fieldThomas Gummerer2012-07-118-51/+63
| * | | | | | | | | Merge branch 'tg/maint-cache-name-compare' into tg/ce-namelen-fieldJunio C Hamano2012-07-112-4/+48
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'nk/maint-gitweb-log-by-lines'Junio C Hamano2012-07-231-15/+18
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | gitweb: Add support to Link: tagNamhyung Kim2012-07-051-0/+10
| * | | | | | | | | | | gitweb: Handle other types of tag in git_print_logNamhyung Kim2012-07-051-1/+1
| * | | | | | | | | | | gitweb: Cleanup git_print_log()Namhyung Kim2012-07-051-14/+7
* | | | | | | | | | | | Update draft release notes to 1.7.12Junio C Hamano2012-07-221-56/+24
* | | | | | | | | | | | Sync with 1.7.11.3Junio C Hamano2012-07-222-1/+55
|\ \ \ \ \ \ \ \ \ \ \ \