summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | Undocument deprecated alias 'push.default=tracking'Matthieu Moy2012-04-241-1/+0
| * | | | | | | | Documentation: explain push.default option a bit moreMatthieu Moy2012-04-241-3/+15
| |/ / / / / / /
* | | | | | | | Merge branch 'jc/index-v4'Junio C Hamano2012-05-029-91/+300
|\ \ \ \ \ \ \ \
| * | | | | | | | index-v4: document the entry formatJunio C Hamano2012-04-271-0/+13
| * | | | | | | | unpack-trees: preserve the index file version of originalJunio C Hamano2012-04-271-0/+1
| * | | | | | | | update-index: upgrade/downgrade on-disk index versionJunio C Hamano2012-04-042-1/+19
| * | | | | | | | read-cache.c: write prefix-compressed names in the indexJunio C Hamano2012-04-042-10/+58
| * | | | | | | | read-cache.c: read prefix-compressed names in index on-disk version v4Junio C Hamano2012-04-031-7/+51
| * | | | | | | | read-cache.c: move code to copy incore to ondisk cache to a helper functionJunio C Hamano2012-04-031-9/+17
| * | | | | | | | read-cache.c: move code to copy ondisk to incore cache to a helper functionJunio C Hamano2012-04-031-19/+25
| * | | | | | | | read-cache.c: report the header version we do not understandJunio C Hamano2012-04-031-2/+4
| * | | | | | | | read-cache.c: make create_from_disk() report number of bytes it consumedJunio C Hamano2012-04-031-3/+6
| * | | | | | | | read-cache.c: allow unaligned mapping of the index fileJunio C Hamano2012-04-031-12/+32
| * | | | | | | | cache.h: hide on-disk index detailsJunio C Hamano2012-04-032-48/+54
| * | | | | | | | varint: make it available outside the context of packJunio C Hamano2012-04-033-0/+40
* | | | | | | | | Merge branch 'master' of https://github.com/git-l10n/git-poJunio C Hamano2012-05-013-931/+1069
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | l10n: Update German translationRalf Thielow2012-05-021-345/+399
| * | | | | | | | | Merge l10n updates from branch 'maint' into masterJiang Xin2012-05-021-717/+984
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | l10n: Update Simplified Chinese translationJiang Xin2012-04-301-306/+351
| * | | | | | | | | | Merge branch 'maint'Jiang Xin2012-04-281-84/+100
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | l10n: Update git.pot (33 new, 24 deleted messages)Jiang Xin2012-04-281-334/+386
| * | | | | | | | | | | Merge master branch for tracking l10n updates of next releaseJiang Xin2012-04-28207-1907/+7952
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Sync with v1.7.10.1Junio C Hamano2012-05-019-284/+7636
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Git 1.7.10.1v1.7.10.1Junio C Hamano2012-05-013-3/+32
| * | | | | | | | | | | | Merge branch 'pw/fast-import-dataref-parsing' into maintJunio C Hamano2012-05-012-33/+364
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'it/fetch-pack-many-refs' into maintJunio C Hamano2012-05-016-6/+162
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jl/maint-submodule-recurse-fetch' into maintJunio C Hamano2012-05-011-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-blame-minimal' into maintJunio C Hamano2012-05-011-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'lp/maint-diff-three-dash-with-graph' into maintJunio C Hamano2012-05-013-2/+299
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rebase-i-submodule-conflict-only' into maintJunio C Hamano2012-05-012-1/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint' of https://github.com/git-l10n/git-poJunio C Hamano2012-05-016-282/+7605
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | / / / / / | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | l10n: Initial German translationRalf Thielow2012-05-011-717/+984
| | | |_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | l10n: Update Simplified Chinese translationJiang Xin2012-04-281-84/+100
| | * | | | | | | | | | | | | | | l10n: Update git.pot (2 new messages)Jiang Xin2012-04-281-83/+96
| | * | | | | | | | | | | | | | | Merge maint branch for tracking l10n updates of git stable versionJiang Xin2012-04-2840-213/+779
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | / / / / / / / / | | | |_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | l10n: Add the German translation team and initialize de.poRalf Thielow2012-04-282-0/+3508
| | * | | | | | | | | | | | | | l10n: Add Danish team (da) to list of teamsByrial Jensen2012-04-121-0/+4
| | * | | | | | | | | | | | | | l10n: New da.po file with 0 translationsByrial Jensen2012-04-121-0/+3503
| | * | | | | | | | | | | | | | l10n: Updated pt_PT languageMarco Sousa2012-04-111-115/+127
| | | |_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'ld/git-p4-tags-and-labels'Junio C Hamano2012-04-306-69/+483
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git p4: fix unit testsLuke Diamand2012-04-251-1/+1
| * | | | | | | | | | | | | | | git p4: move verbose to base classLuke Diamand2012-04-242-28/+14
| * | | | | | | | | | | | | | | git p4: Ignore P4EDITOR if it is emptyLuke Diamand2012-04-241-1/+1
| * | | | | | | | | | | | | | | git p4: Squash P4EDITOR in test harnessLuke Diamand2012-04-241-0/+1
| * | | | | | | | | | | | | | | git p4: fix-up "import/export of labels to/from p4"Luke Diamand2012-04-243-25/+23
| * | | | | | | | | | | | | | | git p4: import/export of labels to/from p4Luke Diamand2012-04-113-39/+468
| * | | | | | | | | | | | | | | git p4: Fixing script editor checksLuke Diamand2012-04-111-2/+2
* | | | | | | | | | | | | | | | Merge branch 'nh/empty-rebase'Junio C Hamano2012-04-309-19/+193
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | git-rebase: add keep_empty flagNeil Horman2012-04-244-8/+55
| * | | | | | | | | | | | | | | | git-cherry-pick: Add test to validate new optionsNeil Horman2012-04-241-1/+24