summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git-p4: improve client path detection when branches are usedva/p4-client-pathVitor Antunes2015-04-232-5/+10
* t9801: check git-p4's branch detection with client spec enabledVitor Antunes2015-04-221-0/+106
* Merge branch 'ld/p4-submit-hint'Junio C Hamano2015-02-111-1/+1
|\
| * git-p4: correct --prepare-p4-only instructionsld/p4-submit-hintLuke Diamand2015-01-231-1/+1
* | Merge branch 'ld/p4-exclude-in-sync'Junio C Hamano2015-02-113-13/+84
|\ \
| * | git-p4: support excluding paths on syncld/p4-exclude-in-syncLuke Diamand2015-02-113-13/+84
| |/
* | Merge branch 'jc/coding-guidelines'Junio C Hamano2015-02-111-3/+8
|\ \
| * | CodingGuidelines: clarify C #include rulesjc/coding-guidelinesJunio C Hamano2015-01-151-3/+8
* | | Merge branch 'ak/typofixes'Junio C Hamano2015-02-112-2/+2
|\ \ \
| * | | t/lib-terminal.sh: fix typoak/typofixesAlexander Kuleshov2015-01-211-1/+1
| * | | pack-bitmap: fix typoAlexander Kuleshov2015-01-211-1/+1
* | | | Git 2.3v2.3.0Junio C Hamano2015-02-053-1/+12
* | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2015-02-021-5/+5
|\ \ \ \
| * | | | l10n: ca.po: Fix trailing whitespaceAlex Henrie2015-01-301-5/+5
|/ / / /
* | | | Git 2.3.0-rc2v2.3.0-rc2Junio C Hamano2015-01-271-1/+1
* | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2015-01-272-929/+941
|\ \ \ \
| * \ \ \ Merge branch 'master' of git://github.com/alexhenrie/git-poJiang Xin2015-01-271-925/+937
| |\ \ \ \
| | * | | | l10n: ca.po: update translationAlex Henrie2015-01-261-925/+937
| * | | | | l10n: de.po: correct singular formMichael J Gruber2015-01-261-1/+1
| * | | | | l10n: de.po: translate "leave behind" correctlyMichael J Gruber2015-01-261-2/+2
| * | | | | l10n: de.po: fix typoBenedikt Heine2015-01-261-2/+2
| |/ / / /
* | | | | Merge branch 'js/t1050'Junio C Hamano2015-01-221-6/+6
|\ \ \ \ \
| * | | | | t1050-large: generate large files without ddjs/t1050Johannes Sixt2015-01-141-6/+6
| | |_|_|/ | |/| | |
* | | | | Merge branch 'ak/cat-file-clean-up'Junio C Hamano2015-01-221-2/+0
|\ \ \ \ \
| * | | | | cat-file: use "type" and "size" from outer scopeak/cat-file-clean-upAlexander Kuleshov2015-01-131-2/+0
| |/ / / /
* | | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2015-01-227-6423/+6506
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | l10n: correct indentation of show-branch usageJiang Xin2015-01-216-64/+62
| * | | | Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin2015-01-217-6430/+6515
| |\ \ \ \
| | * | | | l10n: de.po: translate 3 messagesRalf Thielow2015-01-201-141/+142
| | * | | | l10n: zh_CN: various fixes on command argumentsJiang Xin2015-01-191-176/+175
| | * | | | Merge branch 'v2.3.0' of git://github.com/jnavila/gitJiang Xin2015-01-191-133/+137
| | |\ \ \ \
| | | * | | | l10n: fr.po v2.3.0 round 2Jean-Noel Avila2015-01-181-133/+137
| | * | | | | Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin2015-01-191-131/+131
| | |\ \ \ \ \
| | | * | | | | l10n: sv.po: Update Swedish translation (2298t0f0u)Peter Krefting2015-01-181-131/+131
| | | |/ / / /
| | * | | | | l10n: vi.po(2298t): Updated 3 new stringsTran Ngoc Quan2015-01-191-137/+137
| | |/ / / /
| | * | | | l10n: git.pot: v2.3.0 round 2 (3 updated)Jiang Xin2015-01-181-124/+124
| | * | | | Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin2015-01-187-6003/+6084
| | |\ \ \ \
| | | * | | | l10n: de.po: translate 13 new messagesRalf Thielow2015-01-171-836/+857
| | | * | | | l10n: de.po: fix typoRalf Thielow2015-01-171-1/+1
| | | * | | | l10n: de.po: translate "track" as "versionieren"Ralf Thielow2015-01-171-20/+20
| | | * | | | l10n: zh_CN: translations for git v2.3.0-rc0Jiang Xin2015-01-171-830/+853
| | | * | | | l10n: sv.po: Update Swedish translation (2298t0f0u)Peter Krefting2015-01-141-842/+865
| | | * | | | l10n: fr.po v2.3.0 round 1Jean-Noel Avila2015-01-131-833/+852
| | | * | | | l10n: vi.po(2298t): Updated and change Plural-FormsTran Ngoc Quan2015-01-131-1019/+986
| | | * | | | l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed)Jiang Xin2015-01-131-824/+831
| | | * | | | Merge branch 'master' of git://github.com/alexhenrie/git-poJiang Xin2015-01-131-798/+819
| | | |\ \ \ \
| | | | * | | | l10n: ca.po: various fixesJoan Perals2014-12-231-798/+819
* | | | | | | | Merge branch 'sh/asciidoc-git-version-fix'Junio C Hamano2015-01-221-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation: fix version numberingsh/asciidoc-git-version-fixSven van Haastregt2015-01-221-1/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'jh/empty-notes'Junio C Hamano2015-01-221-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |