summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/two-way-merge-corner-case-fix' into maintJunio C Hamano2013-12-173-97/+121
|\
| * t1005: add test for "read-tree --reset -u A B"jk/two-way-merge-corner-case-fixJunio C Hamano2013-11-041-0/+15
| * t1005: reindentJunio C Hamano2013-11-042-89/+89
| * unpack-trees: fix "read-tree -u --reset A B" with conflicted indexJeff King2013-11-041-8/+17
* | Merge branch 'sb/sha1-loose-object-info-check-existence' into maintJunio C Hamano2013-12-172-6/+15
|\ \
| * | sha1_loose_object_info(): do not return success on missing objectsb/sha1-loose-object-info-check-existenceJunio C Hamano2013-11-062-6/+15
* | | Merge branch 'nd/magic-pathspec' into maintJunio C Hamano2013-12-172-10/+13
|\ \ \
| * | | diff: restrict pathspec limitations to diff b/f case onlynd/magic-pathspecNguyễn Thái Ngọc Duy2013-11-202-10/+13
* | | | cmd_repack(): remove redundant local variable "nr_packs"Michael Haggerty2013-12-171-4/+2
* | | | Git 1.8.5.1v1.8.5.1Junio C Hamano2013-12-034-3/+13
* | | | ref-iteration doc: add_submodule_odb() returns 0 for successNick Townsend2013-12-031-2/+2
* | | | Sync with 1.8.4.5Junio C Hamano2013-12-024-6/+45
|\ \ \ \
| * | | | Git 1.8.4.5v1.8.4.5maint-1.8.4Junio C Hamano2013-12-024-3/+17
| * | | | submodule: do not copy unknown update mode from .gitmodulesJunio C Hamano2013-12-022-5/+30
* | | | | Git 1.8.5v1.8.5Junio C Hamano2013-11-272-1/+6
* | | | | Sync with maintJunio C Hamano2013-11-270-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | remote-hg: don't decode UTF-8 paths into Unicode objectsRichard Hansen2013-11-271-1/+1
* | | | | Merge branch 'rh/remote-hg-bzr-updates' (early part)Junio C Hamano2013-11-251-1/+1
|\ \ \ \ \
| * | | | | remote-hg: don't decode UTF-8 paths into Unicode objectsRichard Hansen2013-11-181-1/+1
* | | | | | Git 1.8.5-rc3v1.8.5-rc3Junio C Hamano2013-11-201-1/+1
* | | | | | Sync with 1.8.4.4Junio C Hamano2013-11-202-1/+12
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Git 1.8.4.4v1.8.4.4Junio C Hamano2013-11-203-2/+13
* | | | | | Merge branch 'mb/relnotes-1.8.5-fix'Junio C Hamano2013-11-201-82/+84
|\ \ \ \ \ \
| * | | | | | RelNotes: spelling & grammar fixesmb/relnotes-1.8.5-fixMarc Branchaud2013-11-181-82/+84
* | | | | | | Merge branch 'nd/literal-pathspecs'Junio C Hamano2013-11-186-5/+30
|\ \ \ \ \ \ \
| * | | | | | | pathspec: stop --*-pathspecs impact on internal parse_pathspec() usesnd/literal-pathspecsnd/liteal-pathspecsNguyễn Thái Ngọc Duy2013-10-286-4/+30
* | | | | | | | Merge branch 'maint'Junio C Hamano2013-11-181-1/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Revert "upload-pack: send non-HEAD symbolic refs"Junio C Hamano2013-11-181-1/+0
* | | | | | | | Merge branch 'jx/branch-vv-always-compare-with-upstream'Junio C Hamano2013-11-182-12/+20
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | branch: fix --verbose output column alignmentjx/branch-vv-always-compare-with-upstreamTorstein Hegge2013-11-182-12/+20
* | | | | | | | Git 1.8.5-rc2v1.8.5-rc2Junio C Hamano2013-11-131-1/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2013-11-127-7412/+9045
|\ \ \ \ \ \ \
| * | | | | | | l10n: de.po: improve error message when pushing to unknown upstreamRalf Thielow2013-11-121-1/+1
| * | | | | | | l10n: de.po: translate 68 new messagesRalf Thielow2013-11-121-1216/+1498
| * | | | | | | po/TEAMS: update Thomas Rast's email addressRalf Thielow2013-11-121-1/+1
| * | | | | | | Merge remote-tracking branch 'sv/nafmo/master'Jiang Xin2013-11-101-1217/+1499
| |\ \ \ \ \ \ \
| | * | | | | | | l10n: Update Swedish translation (2194t0f0u)Peter Krefting2013-11-091-1217/+1499
| * | | | | | | | l10n: fr.po 2194/1294 messages translatedJean-Noel Avila2013-11-081-1230/+1513
| |/ / / / / / /
| * | | | | | | l10n: zh_CN.po: translate 68 messages (2194t0f0u)Jiang Xin2013-11-031-1270/+1508
| * | | | | | | l10n: vi.po (2194t): Update and minor fixTran Ngoc Quan2013-11-021-1276/+1562
| * | | | | | | l10n: git.pot: v1.8.5 round 1 (68 new, 9 removed)Jiang Xin2013-11-021-1201/+1463
* | | | | | | | Correct word usage of "timezone" in "Documentation" directoryJason St. John2013-11-127-22/+22
* | | | | | | | Sync with 1.8.4.3Junio C Hamano2013-11-082-1/+20
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Git 1.8.4.3v1.8.4.3Junio C Hamano2013-11-083-2/+21
| * | | | | | | Merge branch 'jn/test-prereq-perl-doc' into maintJunio C Hamano2013-11-081-4/+11
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ap/remote-hg-unquote-cquote' into maintJunio C Hamano2013-11-081-0/+6
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/upload-pack-send-symref' into maintJunio C Hamano2013-11-086-20/+124
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/http-auth-redirects' into maintJunio C Hamano2013-11-087-65/+191
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Sync with maintJunio C Hamano2013-11-072-3/+39
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Start preparing for 1.8.4.3Junio C Hamano2013-11-072-1/+37