summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | Merge branch 'jk/error-const-return'Junio C Hamano2013-02-141-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Use __VA_ARGS__ for all of error's argumentsMatt Kraai2013-02-081-5/+5
* | | | | | | | | | | | | | | Merge branch 'jx/utf8-printf-width'Junio C Hamano2013-02-143-2/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add utf8_fprintf helper that returns correct number of columnsJiang Xin2013-02-113-2/+25
* | | | | | | | | | | | | | | | Merge branch 'mg/bisect-doc'Junio C Hamano2013-02-141-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | git-bisect.txt: clarify that reset quits bisectMichael J Gruber2013-02-111-1/+6
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'tz/perl-styles'Junio C Hamano2013-02-141-0/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Update CodingGuidelines for PerlTed Zlatanov2013-02-061-0/+42
* | | | | | | | | | | | | | | | | Merge branch 'jc/extended-fake-ancestor-for-gitlink'Junio C Hamano2013-02-141-2/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | apply: verify submodule commit object name betterJunio C Hamano2013-02-051-2/+38
* | | | | | | | | | | | | | | | | | Merge branch 'dg/subtree-fixes'Junio C Hamano2013-02-144-66/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | contrib/subtree: make the manual directory if neededJesper L. Nielsen2013-02-051-0/+1
| * | | | | | | | | | | | | | | | | contrib/subtree: honor DESTDIRAdam Tkac2013-02-051-2/+2
| * | | | | | | | | | | | | | | | | contrib/subtree: fix synopsisDavid A. Greene2013-02-052-1/+8
| * | | | | | | | | | | | | | | | | contrib/subtree: better error handling for 'subtree add'David A. Greene2013-02-051-3/+9
| * | | | | | | | | | | | | | | | | contrib/subtree: use %B for split subject/bodyTechlive Zheng2013-02-052-5/+20
| * | | | | | | | | | | | | | | | | contrib/subtree: remove test number commentsDavid A. Greene2013-02-051-55/+0
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2013-02-123-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Replace filepattern with pathspec for consistencyMatthieu Moy2013-02-123-8/+8
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Update draft release notes to 1.8.2Junio C Hamano2013-02-101-0/+25
* | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2013-02-101-16/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | user-manual: Rewrite git-gc section for automatic packingW. Trevor King2013-02-101-12/+6
| * | | | | | | | | | | | | | | user-manual: Fix 'you - Git' -> 'you--Git' typoW. Trevor King2013-02-101-1/+1
| * | | | | | | | | | | | | | | user-manual: Fix 'http' -> 'HTTP' typosW. Trevor King2013-02-101-3/+3
| * | | | | | | | | | | | | | | user-manual: Fix 'both: so' -> 'both; so' typoW. Trevor King2013-02-101-1/+1
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'sp/smart-http-content-type-check'Junio C Hamano2013-02-108-17/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | http_request: reset "type" strbuf before addingJeff King2013-02-061-0/+1
| * | | | | | | | | | | | | | | t5551: fix expected error outputJunio C Hamano2013-02-041-2/+1
| * | | | | | | | | | | | | | | Verify Content-Type from smart HTTP serversShawn Pearce2013-02-048-17/+59
* | | | | | | | | | | | | | | | Merge branch 'master' of git://github.com/git-l10n/git-poJunio C Hamano2013-02-096-4559/+4728
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | l10n: de.po: translate "reset" as "neu setzen"Ralf Thielow2013-02-081-8/+8
| * | | | | | | | | | | | | | | | l10n: de.po: translate "revision" consistently as "Revision"Ralf Thielow2013-02-081-9/+9
| * | | | | | | | | | | | | | | | l10n: de.po: translate 11 new messagesRalf Thielow2013-02-081-650/+722
| * | | | | | | | | | | | | | | | l10n: zh_CN.po: 800+ new translations on command usagesWang Sheng2013-02-092-2136/+2123
| * | | | | | | | | | | | | | | | l10n: Update Swedish translation (1983t0f0u)Peter Krefting2013-01-271-563/+601
| * | | | | | | | | | | | | | | | l10n: vi.po: updated Vietnamese translationTran Ngoc Quan2013-01-251-572/+610
| * | | | | | | | | | | | | | | | Merge branch 'master' of git://github.com/ralfth/git-po-deJiang Xin2013-01-251-96/+109
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | l10n: de.po: fix some minor issuesRalf Thielow2013-01-231-96/+109
| * | | | | | | | | | | | | | | | | l10n: Update git.pot (11 new, 7 removed messages)Jiang Xin2013-01-251-558/+579
* | | | | | | | | | | | | | | | | | Merge branch 'jc/combine-diff-many-parents'Junio C Hamano2013-02-082-14/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | t4038: add tests for "diff --cc --raw <trees>"John Keeping2013-02-051-0/+24
| * | | | | | | | | | | | | | | | | | combine-diff: lift 32-way limit of combined diffJunio C Hamano2013-02-031-14/+7
| | |_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/apply-similaritly-parsing'Junio C Hamano2013-02-081-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | builtin/apply: tighten (dis)similarity index parsingJohn Keeping2013-02-031-4/+6
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'mk/tcsh-complete-only-known-paths'Junio C Hamano2013-02-081-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | completion: handle path completion and colon for tcsh scriptMarc Khouzam2013-02-031-0/+12
* | | | | | | | | | | | | | | | | | | Merge branch 'mp/complete-paths'Junio C Hamano2013-02-081-15/+240
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | git-completion.bash: add support for path completionManlio Perillo2013-01-111-15/+240
* | | | | | | | | | | | | | | | | | | Merge branch 'ct/autoconf-htmldir'Junio C Hamano2013-02-081-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Honor configure's htmldir switchChristoph J. Thompson2013-02-021-1/+2
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |