summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Sync with l10n treeold-nextJunio C Hamano2014-08-259-9039/+21279
|\
| * Merge git://github.com/git-l10n/git-poJunio C Hamano2014-08-259-9039/+21279
| |\
| | * l10n: de.po: improve message when switching branchesRalf Thielow2014-08-231-3/+3
| | * l10n: de.po: fix typoRalf Thielow2014-08-231-2/+2
| | * po/TEAMS: Add Catalan teamAlex Henrie2014-08-221-0/+4
| | * l10n: Add Catalan translationAlex Henrie2014-08-221-0/+10951
| | * l10n: fr.po (2257t) update for version 2.1.0Jean-Noel Avila2014-08-071-1353/+1518
| | * Merge remote-tracking branch 'l10n/vi/vnwildman/master'Jiang Xin2014-08-051-1350/+1503
| | |\
| | | * l10n: vi.po (2257t): Update translationTran Ngoc Quan2014-08-051-1350/+1503
| | * | Merge branch 'master' of github.com:alshopov/git-poJiang Xin2014-08-051-549/+601
| | |\ \
| | | * | l10n: Updated Bulgarian translation of git (2257t,0f,0u)Alexander Shopov2014-08-041-549/+601
| | | |/
| | * | l10n: sv.po: Update Swedish translation (2257t0f0u)Peter Krefting2014-08-051-1342/+1493
| | |/
| | * l10n: zh_CN: translations for git v2.1.0-rc0Jiang Xin2014-08-041-1342/+1480
| | * Merge commit 'bg/alshopov/master'Jiang Xin2014-08-041-2208/+2694
| | |\
| | | * l10n: Updated Bulgarian translation of git (2247t,0f,0u)Alexander Shopov2014-08-031-1252/+1348
| | | * l10n: Updated Bulgarian translation of git (2228t,0f,0u)Alexander Shopov2014-08-031-962/+1352
| | * | Merge remote-tracking branch 'sv/nafmo/master'Jiang Xin2014-08-041-19/+19
| | |\ \
| | | * | l10n: Fix more typos in the Swedish translationsPeter Krefting2014-06-241-19/+19
| | * | | l10n: git.pot: v2.1.0 round 1 (38 new, 9 removed)Jiang Xin2014-08-041-1332/+1472
* | | | | Merge branch 'jk/diff-tree-t-fix' into nextJunio C Hamano2014-08-212-1/+45
|\ \ \ \ \
| * | | | | intersect_paths: respect mode in git's tree-sortjk/diff-tree-t-fixJeff King2014-08-202-1/+45
* | | | | | Merge branch 'jk/pack-shallow-always-without-bitmap' into nextJunio C Hamano2014-08-212-0/+40
|\ \ \ \ \ \
| * | | | | | pack-objects: turn off bitmaps when we see --shallow linesjk/pack-shallow-always-without-bitmapJeff King2014-08-122-0/+40
* | | | | | | Merge branch 'jk/fix-profile-feedback-build' into nextJunio C Hamano2014-08-211-1/+5
|\ \ \ \ \ \ \
| * | | | | | | Makefile: make perf tests optional for profile buildjk/fix-profile-feedback-buildJeff King2014-08-191-1/+5
* | | | | | | | Merge branch 'rs/strbuf-getcwd' into nextJunio C Hamano2014-08-181-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | fixup! setup: convert setup_git_directory_gently_1 et al. to strbufJunio C Hamano2014-08-181-1/+1
* | | | | | | | | Sync with 2.1Junio C Hamano2014-08-152-1/+6
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Git 2.1v2.1.0Junio C Hamano2014-08-152-1/+6
* | | | | | | | | Sync with masterJunio C Hamano2014-08-133-6/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | tests: fix negated test_i18ngrep callsJohannes Sixt2014-08-133-6/+6
* | | | | | | | | Merge branch 'ta/pretty-parse-config' into nextJunio C Hamano2014-08-131-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pretty.c: make git_pretty_formats_config return -1 on git_config_string failureta/pretty-parse-configTanay Abhra2014-08-041-1/+3
* | | | | | | | | | Merge branch 'bc/archive-pax-header-mode' into nextJunio C Hamano2014-08-132-2/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | archive: honor tar.umask even for pax headersbc/archive-pax-header-modebrian m. carlson2014-08-042-2/+7
* | | | | | | | | | | Merge branch 'pr/remotes-in-hashmap' into nextJunio C Hamano2014-08-132-17/+49
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | use a hashmap to make remotes fasterpr/remotes-in-hashmapPatrick Reynolds2014-07-302-17/+49
* | | | | | | | | | | | Merge branch 'jk/pretty-empty-format' into nextJunio C Hamano2014-08-135-6/+14
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | pretty: make empty userformats truly emptyjk/pretty-empty-formatJeff King2014-07-304-3/+11
| * | | | | | | | | | | | pretty: treat "--format=" as an empty userformatJeff King2014-07-301-2/+2
| * | | | | | | | | | | | revision: drop useless string offset when parsing "--pretty"Jeff King2014-07-301-1/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'nd/multiple-work-trees-1' into nextJunio C Hamano2014-08-1310-66/+106
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | checkout --to: do not touch existing target directorynd/multiple-work-trees-1Nguyễn Thái Ngọc Duy2014-07-291-0/+2
| * | | | | | | | | | | | checkout: prefix --to argument properly when cwd is movedNguyễn Thái Ngọc Duy2014-07-291-1/+1
| * | | | | | | | | | | | environment.c: fix incorrect git_graft_file initializationNguyễn Thái Ngọc Duy2014-07-293-1/+20
| * | | | | | | | | | | | checkout --to: fix dangling pointers in remove_junk()Nguyễn Thái Ngọc Duy2014-07-292-5/+16
| * | | | | | | | | | | | checkout: no auto-detach if the ref is already checked outNguyễn Thái Ngọc Duy2014-07-295-44/+55
| * | | | | | | | | | | | prune --repos: fix uninitialized accessNguyễn Thái Ngọc Duy2014-07-292-11/+7
| * | | | | | | | | | | | checkout: no need to call check_linked_checkouts if head_ref is NULLNguyễn Thái Ngọc Duy2014-07-291-1/+2
| * | | | | | | | | | | | gitrepository-layout.txt: s/ignored/ignored if/Nguyễn Thái Ngọc Duy2014-07-291-3/+3