summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | Git 2.3.0-rc1v2.3.0-rc1Junio C Hamano2015-01-202-1/+6
* | | | Merge branch 'jk/http-push-symref-fix'Junio C Hamano2015-01-201-0/+3
|\ \ \ \
| * | | | http-push: trim trailing newline from remote symrefjk/http-push-symref-fixJeff King2015-01-141-0/+3
* | | | | Merge branch 'ak/show-branch-usage-string'Junio C Hamano2015-01-201-3/+3
|\ \ \ \ \
| * | | | | show-branch: fix indentation of usage stringak/show-branch-usage-stringRalf Thielow2015-01-201-3/+3
* | | | | | Merge branch 'jk/colors'Junio C Hamano2015-01-202-0/+5
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | parse_color: fix return value for numeric color values 0-8Jeff King2015-01-202-0/+5
* | | | | | git-svn: make it play nicely with submodulesRamkumar Ramachandra2015-01-151-0/+6
* | | | | | Git::SVN: handle missing ref_id case correctlyRamkumar Ramachandra2015-01-151-1/+1
* | | | | | Fifth batch for 2.3 cycleJunio C Hamano2015-01-141-2/+27
* | | | | | Merge branch 'po/doc-core-ignorestat'Junio C Hamano2015-01-141-8/+13
|\ \ \ \ \ \
| * | | | | | doc: core.ignoreStat update, and clarify the --assume-unchanged effectpo/doc-core-ignorestatPhilip Oakley2015-01-121-9/+13
| * | | | | | doc: core.ignoreStat clarify the --assume-unchanged effectPhilip Oakley2014-12-121-4/+5
* | | | | | | Merge branch 'rc/for-each-ref-tracking'Junio C Hamano2015-01-142-2/+22
|\ \ \ \ \ \ \
| * | | | | | | for-each-ref: always check stat_tracking_info()'s return valuerc/for-each-ref-trackingRaphael Kubo da Costa2015-01-122-2/+22
* | | | | | | | Merge branch 'rh/autoconf-rhel3'Junio C Hamano2015-01-145-1/+56
|\ \ \ \ \ \ \ \
| * | | | | | | | configure.ac: check for HMAC_CTX_cleanuprh/autoconf-rhel3Reuben Hawkins2015-01-093-0/+13
| * | | | | | | | configure.ac: check for clock_gettime and CLOCK_MONOTONICReuben Hawkins2015-01-094-1/+30
| * | | | | | | | configure.ac: check 'tv_nsec' field in 'struct stat'Reuben Hawkins2015-01-091-0/+13
* | | | | | | | | Merge branch 'ak/fewer-includes'Junio C Hamano2015-01-142-7/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | cat-file: remove unused includesak/fewer-includesAlexander Kuleshov2015-01-091-4/+0
| * | | | | | | | | git.c: remove unnecessary #includesAlexander Kuleshov2015-01-091-3/+0
* | | | | | | | | | Merge branch 'ak/doc-add-v-n-options'Junio C Hamano2015-01-141-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation: list long options for -v and -nak/doc-add-v-n-optionsAlexander Kuleshov2015-01-091-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'ak/show-branch-usage-string'Junio C Hamano2015-01-141-1/+4
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | show-branch: line-wrap show-branch usageAlexander Kuleshov2015-01-081-1/+4
* | | | | | | | | | Merge branch 'rh/test-color-avoid-terminfo-in-original-home'Junio C Hamano2015-01-141-44/+48
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | test-lib.sh: do tests for color support after changing HOMERichard Hansen2015-01-071-43/+47
| * | | | | | | | | | test-lib: use 'test ...' instead of '[ ... ]'Richard Hansen2015-01-071-3/+3