summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | | | | | git-cherry-pick: Add keep-redundant-commits optionNeil Horman2012-04-244-13/+102
| * | | | | | | | | | git-cherry-pick: add allow-empty optionNeil Horman2012-04-114-2/+17
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/maint-config-bogus-section'Junio C Hamano2012-04-302-1/+31
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | config: reject bogus section names for --rename-sectionJeff King2012-04-252-1/+31
* | | | | | | | | | | The seventh batch of topics graduated to 'master'Junio C Hamano2012-04-291-0/+16
* | | | | | | | | | | Merge branch 'js/daemon-test-race-fix'Junio C Hamano2012-04-291-11/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t5570: fix forwarding of git-daemon messages via catJohannes Sixt2012-04-271-11/+11
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'kk/gitweb-omit-expensive'Junio C Hamano2012-04-292-10/+32
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | gitweb: Option to not display information about ownerKacper Kornet2012-04-262-6/+18
| * | | | | | | | | | | gitweb: Option to omit column with time of the last changeKacper Kornet2012-04-252-5/+15
* | | | | | | | | | | | Merge branch 'kk/maint-gitweb-missing-owner'Junio C Hamano2012-04-291-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | gitweb: Don't set owner if got empty value from projects.listKacper Kornet2012-04-251-2/+4
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'rs/commit-list-append'Junio C Hamano2012-04-294-45/+31
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | commit: remove commit_list_reverse()René Scharfe2012-04-252-16/+0
| * | | | | | | | | | | revision: append to list instead of insert and reverseRené Scharfe2012-04-251-2/+2
| * | | | | | | | | | | sequencer: export commit_list_append()René Scharfe2012-04-253-27/+29
* | | | | | | | | | | | Merge branch 'mm/include-userpath'Junio C Hamano2012-04-293-1/+18
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | config: expand tildes in include.path variableJeff King2012-04-293-1/+18
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'pw/t5800-import-race-fix'Junio C Hamano2012-04-292-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git-remote-testgit: fix race when spawning fast-importPete Wyckoff2012-04-242-0/+20
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/repack-no-explode-objects-from-old-pack'Junio C Hamano2012-04-297-53/+107
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | gc: use argv-array for sub-commandsJeff King2012-04-181-45/+33