summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * git-remote-mediawiki: don't compute the diff when getting commit messageMatthieu Moy2012-06-271-2/+2
* | Merge branch 'tr/maint-show-walk'Junio C Hamano2012-07-132-0/+94
|\ \
| * | show: fix "range implies walking"Junio C Hamano2012-06-192-2/+5
| * | Demonstrate git-show is broken with rangesThomas Rast2012-06-191-0/+91
* | | Merge branch 'mz/rebase-no-mbox'Junio C Hamano2012-07-137-36/+66
|\ \ \
| * | | am: don't call mailinfo if $rebasingMartin von Zweigbergk2012-06-261-23/+24
| * | | am --rebasing: get patch body from commit, not from mailboxMartin von Zweigbergk2012-06-262-4/+29
| * | | rebase --root: print usage on too many argsMartin von Zweigbergk2012-06-262-2/+12
| * | | rebase: don't source git-sh-setup twiceMartin von Zweigbergk2012-06-263-7/+1
* | | | Reduce draft release notes to 1.7.12Junio C Hamano2012-07-111-61/+0
* | | | Sync with 1.7.11.2Junio C Hamano2012-07-112-1/+55
|\ \ \ \
| * | | | Git 1.7.11.2v1.7.11.2Junio C Hamano2012-07-114-3/+57
| * | | | Merge branch 'jc/maint-blame-unique-abbrev' into maintJunio C Hamano2012-07-111-4/+21
| |\ \ \ \
| * \ \ \ \ Merge branch 'rj/platform-pread-may-be-thread-unsafe' into maintJunio C Hamano2012-07-112-2/+10
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'th/diff-no-index-fixes' into maintJunio C Hamano2012-07-115-24/+112
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'nd/clone-single-fix' into maintJunio C Hamano2012-07-112-3/+11
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/rev-list-simplify-merges-first-parent' into maintJunio C Hamano2012-07-111-12/+29
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'hv/submodule-update-nuke-submodules' into maintJunio C Hamano2012-07-111-6/+0
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/diff-no-index-pager' into maintJunio C Hamano2012-07-113-15/+22
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/verify-filename-fix' into maintJunio C Hamano2012-07-118-10/+44
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cn/cherry-pick-range-docs' into maintJunio C Hamano2012-07-112-1/+13
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/ustar-checksum-is-unsigned' into maintJunio C Hamano2012-07-111-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/bundle-complete-notice' into maintJunio C Hamano2012-07-111-6/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/ls-files-i-dir' into maintJunio C Hamano2012-07-116-10/+109
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/request-pull-match-tagname' into maintJunio C Hamano2012-07-111-7/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge git://github.com/git-l10n/git-poJunio C Hamano2012-07-095-1090/+1727
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | l10n: zh_CN.po: translate 29 new messagesJiang Xin2012-07-061-215/+351
| * | | | | | | | | | | | | | | | | | l10n: de.po: translate 29 new messagesRalf Thielow2012-07-051-220/+349
| * | | | | | | | | | | | | | | | | | Update Swedish translation (1095t0f0u)Peter Krefting2012-07-041-211/+334
| * | | | | | | | | | | | | | | | | | l10n: Update translation for VietnameseTran Ngoc Quan2012-07-031-236/+364
| * | | | | | | | | | | | | | | | | | l10n: Update git.pot (29 new messages)Jiang Xin2012-07-031-208/+329
* | | | | | | | | | | | | | | | | | | Fifth batch for 1.7.12Junio C Hamano2012-07-091-0/+43
* | | | | | | | | | | | | | | | | | | Merge branch 'cw/help-over-network'Junio C Hamano2012-07-091-4/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Allow help.htmlpath to be a URL prefixChris Webb2012-06-281-3/+5
| * | | | | | | | | | | | | | | | | | | Add config variable to set HTML path for git-help --webChris Webb2012-06-281-1/+10
* | | | | | | | | | | | | | | | | | | | Merge branch 'mz/empty-rebase-test'Junio C Hamano2012-07-091-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | add test case for rebase of empty commitMartin von Zweigbergk2012-06-271-0/+8
* | | | | | | | | | | | | | | | | | | | | Merge branch 'pw/git-p4-tests'Junio C Hamano2012-07-099-433/+574
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | git p4 test: fix badp4dir testPete Wyckoff2012-06-271-3/+7
| * | | | | | | | | | | | | | | | | | | | | git p4 test: split up big t9800 testPete Wyckoff2012-06-274-397/+506
| * | | | | | | | | | | | | | | | | | | | | git p4 test: cleanup_git should make a new $gitPete Wyckoff2012-06-273-2/+3
| * | | | | | | | | | | | | | | | | | | | | git p4 test: copy source indeterminatePete Wyckoff2012-06-271-2/+2
| * | | | | | | | | | | | | | | | | | | | | git p4 test: check for error message in failed testPete Wyckoff2012-06-271-1/+2
| * | | | | | | | | | | | | | | | | | | | | git p4 test: rename some "git-p4 command" stringsPete Wyckoff2012-06-271-3/+3