Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/two-way-merge-corner-case-fix' into maint | Junio C Hamano | 2013-12-17 | 3 | -97/+121 |
|\ | |||||
| * | t1005: add test for "read-tree --reset -u A B"jk/two-way-merge-corner-case-fix | Junio C Hamano | 2013-11-04 | 1 | -0/+15 |
| * | t1005: reindent | Junio C Hamano | 2013-11-04 | 2 | -89/+89 |
| * | unpack-trees: fix "read-tree -u --reset A B" with conflicted index | Jeff King | 2013-11-04 | 1 | -8/+17 |
* | | Merge branch 'sb/sha1-loose-object-info-check-existence' into maint | Junio C Hamano | 2013-12-17 | 2 | -6/+15 |
|\ \ | |||||
| * | | sha1_loose_object_info(): do not return success on missing objectsb/sha1-loose-object-info-check-existence | Junio C Hamano | 2013-11-06 | 2 | -6/+15 |
* | | | Merge branch 'nd/magic-pathspec' into maint | Junio C Hamano | 2013-12-17 | 2 | -10/+13 |
|\ \ \ | |||||
| * | | | diff: restrict pathspec limitations to diff b/f case onlynd/magic-pathspec | Nguyễn Thái Ngọc Duy | 2013-11-20 | 2 | -10/+13 |
* | | | | cmd_repack(): remove redundant local variable "nr_packs" | Michael Haggerty | 2013-12-17 | 1 | -4/+2 |
* | | | | Git 1.8.5.1v1.8.5.1 | Junio C Hamano | 2013-12-03 | 4 | -3/+13 |
* | | | | ref-iteration doc: add_submodule_odb() returns 0 for success | Nick Townsend | 2013-12-03 | 1 | -2/+2 |
* | | | | Sync with 1.8.4.5 | Junio C Hamano | 2013-12-02 | 4 | -6/+45 |
|\ \ \ \ | |||||
| * | | | | Git 1.8.4.5v1.8.4.5maint-1.8.4 | Junio C Hamano | 2013-12-02 | 4 | -3/+17 |
| * | | | | submodule: do not copy unknown update mode from .gitmodules | Junio C Hamano | 2013-12-02 | 2 | -5/+30 |
* | | | | | Git 1.8.5v1.8.5 | Junio C Hamano | 2013-11-27 | 2 | -1/+6 |
* | | | | | Sync with maint | Junio C Hamano | 2013-11-27 | 0 | -0/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | remote-hg: don't decode UTF-8 paths into Unicode objects | Richard Hansen | 2013-11-27 | 1 | -1/+1 |
* | | | | | Merge branch 'rh/remote-hg-bzr-updates' (early part) | Junio C Hamano | 2013-11-25 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | remote-hg: don't decode UTF-8 paths into Unicode objects | Richard Hansen | 2013-11-18 | 1 | -1/+1 |
* | | | | | | Git 1.8.5-rc3v1.8.5-rc3 | Junio C Hamano | 2013-11-20 | 1 | -1/+1 |
* | | | | | | Sync with 1.8.4.4 | Junio C Hamano | 2013-11-20 | 2 | -1/+12 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Git 1.8.4.4v1.8.4.4 | Junio C Hamano | 2013-11-20 | 3 | -2/+13 |
* | | | | | | Merge branch 'mb/relnotes-1.8.5-fix' | Junio C Hamano | 2013-11-20 | 1 | -82/+84 |
|\ \ \ \ \ \ | |||||
| * | | | | | | RelNotes: spelling & grammar fixesmb/relnotes-1.8.5-fix | Marc Branchaud | 2013-11-18 | 1 | -82/+84 |
* | | | | | | | Merge branch 'nd/literal-pathspecs' | Junio C Hamano | 2013-11-18 | 6 | -5/+30 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | pathspec: stop --*-pathspecs impact on internal parse_pathspec() usesnd/literal-pathspecsnd/liteal-pathspecs | Nguyễn Thái Ngọc Duy | 2013-10-28 | 6 | -4/+30 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2013-11-18 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Revert "upload-pack: send non-HEAD symbolic refs" | Junio C Hamano | 2013-11-18 | 1 | -1/+0 |
* | | | | | | | | Merge branch 'jx/branch-vv-always-compare-with-upstream' | Junio C Hamano | 2013-11-18 | 2 | -12/+20 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | branch: fix --verbose output column alignmentjx/branch-vv-always-compare-with-upstream | Torstein Hegge | 2013-11-18 | 2 | -12/+20 |
* | | | | | | | | Git 1.8.5-rc2v1.8.5-rc2 | Junio C Hamano | 2013-11-13 | 1 | -1/+1 |
| |_|_|/ / / / |/| | | | | | | |||||
* | | | | | | | Merge git://github.com/git-l10n/git-po | Junio C Hamano | 2013-11-12 | 7 | -7412/+9045 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | l10n: de.po: improve error message when pushing to unknown upstream | Ralf Thielow | 2013-11-12 | 1 | -1/+1 |
| * | | | | | | | l10n: de.po: translate 68 new messages | Ralf Thielow | 2013-11-12 | 1 | -1216/+1498 |
| * | | | | | | | po/TEAMS: update Thomas Rast's email address | Ralf Thielow | 2013-11-12 | 1 | -1/+1 |
| * | | | | | | | Merge remote-tracking branch 'sv/nafmo/master' | Jiang Xin | 2013-11-10 | 1 | -1217/+1499 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | l10n: Update Swedish translation (2194t0f0u) | Peter Krefting | 2013-11-09 | 1 | -1217/+1499 |
| * | | | | | | | | l10n: fr.po 2194/1294 messages translated | Jean-Noel Avila | 2013-11-08 | 1 | -1230/+1513 |
| |/ / / / / / / | |||||
| * | | | | | | | l10n: zh_CN.po: translate 68 messages (2194t0f0u) | Jiang Xin | 2013-11-03 | 1 | -1270/+1508 |
| * | | | | | | | l10n: vi.po (2194t): Update and minor fix | Tran Ngoc Quan | 2013-11-02 | 1 | -1276/+1562 |
| * | | | | | | | l10n: git.pot: v1.8.5 round 1 (68 new, 9 removed) | Jiang Xin | 2013-11-02 | 1 | -1201/+1463 |
* | | | | | | | | Correct word usage of "timezone" in "Documentation" directory | Jason St. John | 2013-11-12 | 7 | -22/+22 |
* | | | | | | | | Sync with 1.8.4.3 | Junio C Hamano | 2013-11-08 | 2 | -1/+20 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Git 1.8.4.3v1.8.4.3 | Junio C Hamano | 2013-11-08 | 3 | -2/+21 |
| * | | | | | | | Merge branch 'jn/test-prereq-perl-doc' into maint | Junio C Hamano | 2013-11-08 | 1 | -4/+11 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'ap/remote-hg-unquote-cquote' into maint | Junio C Hamano | 2013-11-08 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jc/upload-pack-send-symref' into maint | Junio C Hamano | 2013-11-08 | 6 | -20/+124 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/http-auth-redirects' into maint | Junio C Hamano | 2013-11-08 | 7 | -65/+191 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ | Sync with maint | Junio C Hamano | 2013-11-07 | 2 | -3/+39 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Start preparing for 1.8.4.3 | Junio C Hamano | 2013-11-07 | 2 | -1/+37 |