summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 1.7.11-rc3v1.7.11-rc3Junio C Hamano2012-06-122-2/+7
* Merge git://github.com/git-l10n/git-poJunio C Hamano2012-06-124-38/+777
|\
| * Merge git://github.com/ralfth/git-po-deJiang Xin2012-06-121-6/+210
| |\
| | * l10n: de.po: translate 27 new messagesRalf Thielow2012-06-111-6/+210
| * | l10n: Update po/vi.po to v1.7.11.rc2.2.gb694fbbTran Ngoc Quan2012-06-091-8/+204
| |/
| * l10n: zh_CN.po: translate 27 new messagesJiang Xin2012-06-081-20/+197
| * l10n: Update git.pot (27 new, 1 removed messages)Jiang Xin2012-06-081-4/+166
* | Merge branch 'mm/api-credentials-doc'Junio C Hamano2012-06-121-1/+4
|\ \
| * | api-credential.txt: document that helpers field is filled-in automaticallyMatthieu Moy2012-06-121-1/+4
* | | Merge branch 'jc/fmt-merge-msg-people'Junio C Hamano2012-06-122-20/+20
|\ \ \
| * | | fmt-merge-msg: make attribution into comment linesJunio C Hamano2012-06-062-20/+20
* | | | Merge branch 'js/maint-fast-export-mark-error'Junio C Hamano2012-06-121-1/+1
|\ \ \ \
| * | | | fast-export: report SHA-1 instead of gibberish when marks exist alreadyJohannes Schindelin2012-06-121-1/+1
* | | | | git-svn: use YAML format for mergeinfo cache when possibleJonathan Nieder2012-06-103-6/+119
* | | | | git-svn: make Git::SVN::RA a separate fileJonathan Nieder2012-06-103-611/+660
* | | | | git-svn: make Git::SVN::Editor a separate fileJonathan Nieder2012-06-104-471/+541
* | | | | Merge branch 'mm/api-credentials-doc'Junio C Hamano2012-06-085-6/+8
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | |
| * | | docs: fix cross-directory linkgit referencesJeff King2012-06-085-6/+8
* | | | Git 1.7.11-rc2v1.7.11-rc2Junio C Hamano2012-06-072-12/+15
* | | | Merge branch 'mm/api-credentials-doc'Junio C Hamano2012-06-073-7/+60
|\ \ \ \ | |/ / /
| * | | api-credentials.txt: add "see also" sectionMatthieu Moy2012-06-041-0/+7
| * | | api-credentials.txt: mention credential.helper explicitlyMatthieu Moy2012-06-041-2/+4
| * | | api-credentials.txt: show the big picture firstMatthieu Moy2012-06-041-3/+47
| * | | doc: fix xref link from api docs to manual pagesJunio C Hamano2012-06-042-2/+2
* | | | Merge branch 'rr/maint-t3510-cascade-fix'Junio C Hamano2012-06-071-1/+1
|\ \ \ \
| * | | | t3510 (cherry-pick-sequence): add missing '&&'Ramkumar Ramachandra2012-06-041-1/+1
* | | | | Merge branch 'jc/svn-auth-providers-unusable-at-1.6.12'Junio C Hamano2012-06-071-1/+1
|\ \ \ \ \
| * | | | | git-svn: platform auth providers are working only on 1.6.15 or newerJunio C Hamano2012-06-041-1/+1
* | | | | | Merge branch 'cr/persistent-https'Junio C Hamano2012-06-077-0/+860
|\ \ \ \ \ \
| * | | | | | Add persistent-https to contribColby Ranger2012-05-307-0/+860
* | | | | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2012-06-054-1112/+2764
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge git://github.com/ralfth/git-po-deJiang Xin2012-06-041-439/+2054
| |\ \ \ \ \ \ \
| | * | | | | | | l10n: de.po: add additional newlineRalf Thielow2012-06-021-2/+2
| | * | | | | | | l10n: de.po: translate 2 new, 3 fuzzy messagesRalf Thielow2012-06-021-227/+247
| | * | | | | | | l10n: de.po: translate 41 new messagesRalf Thielow2012-06-021-20/+201
| | * | | | | | | l10n: de.po: translate 265 new messagesRalf Thielow2012-06-021-390/+1804
| * | | | | | | | l10n: Update translation for VietnameseTran Ngoc Quan2012-06-041-250/+264
| |/ / / / / / /
| * | | | | | | l10n: zh_CN.po: translate 2 new, 3 fuzzy messagesJiang Xin2012-06-021-214/+227
| * | | | | | | l10n: Update git.pot (5 new, 3 removed messages)Jiang Xin2012-06-021-209/+219
* | | | | | | | Git 1.7.11-rc1v1.7.11-rc1Junio C Hamano2012-06-032-7/+2
* | | | | | | | Sync with 1.7.10.4Junio C Hamano2012-06-032-1/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | |
| * | | | | | Git 1.7.10.4v1.7.10.4Junio C Hamano2012-06-032-1/+6
| * | | | | | Merge branch 'ef/maint-rebase-error-message' into maintJunio C Hamano2012-06-032-1/+6
| |\ \ \ \ \ \
* | | | | | | | Update draft release notes to 1.7.11Junio C Hamano2012-06-011-18/+14
* | | | | | | | Merge branch 'ef/maint-rebase-error-message'Junio C Hamano2012-06-012-1/+6
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | rebase: report invalid commit correctlyErik Faye-Lund2012-05-302-1/+6
* | | | | | | | Merge branch 'nh/empty-rebase'Junio C Hamano2012-06-012-28/+75
|\ \ \ \ \ \ \ \
| * | | | | | | | cherry-pick: regression fix for empty commitsJunio C Hamano2012-05-292-28/+75
* | | | | | | | | Merge branch 'vr/rebase-autosquash-does-not-imply-i'Junio C Hamano2012-06-011-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Do not autosquash in case of an implied interactive rebaseVincent van Ravesteijn2012-05-291-0/+1