summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | Merge branch 'mm/levenstein-penalize-deletion-less'Junio C Hamano2012-06-011-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Reduce cost of deletion in levenstein distance (4 -> 3)Matthieu Moy2012-05-291-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'jl/submodule-report-new-path-once'Junio C Hamano2012-06-011-3/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | submodules: print "registered for path" message only onceJens Lehmann2012-05-291-3/+4
| |/ / / / / / /
* | | | | | | | Sync with maintJunio C Hamano2012-06-013-2/+28
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Start preparing for 1.7.10.4Junio C Hamano2012-06-013-2/+28
| * | | | | | | Merge branch 'ef/http-o-depends-on-gvf' into maintJunio C Hamano2012-06-011-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Makefile: add missing GIT-VERSION-FILE dependencyErik Faye-Lund2012-05-311-1/+1
| * | | | | | | | Merge branch 'rs/maint-grep-F' into maintJunio C Hamano2012-06-015-24/+68
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/ident-split-fix' into maintJunio C Hamano2012-06-012-1/+8
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/pretty-commit-header-incomplete-line' into maintJunio C Hamano2012-06-011-1/+4
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/format-person-part-buffer-limit' into maintJunio C Hamano2012-06-011-2/+4
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ap/checkout-no-progress-for-non-tty' into maintJunio C Hamano2012-06-011-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano2012-06-011-247/+289
| |\ \ \ \ \ \ \ \ \ \ \ \ \