summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t7610: clean up foo.XXXXXX tmpdirak/lazy-prereq-mktempJeff King2016-11-291-1/+2
* t7610: test for mktemp before test executionArmin Kunaschik2016-07-061-1/+6
* Start preparing for 2.9.1Junio C Hamano2016-06-272-1/+29
* Merge branch 'rs/xdiff-hunk-with-func-line' into maintJunio C Hamano2016-06-2710-93/+365
|\
| * xdiff: fix merging of appended hunk with -Wrs/xdiff-hunk-with-func-lineRené Scharfe2016-06-092-2/+25
| * grep: -W: don't extend context to trailing empty linesRené Scharfe2016-05-312-3/+27
| * t7810: add test for grep -W and trailing empty context linesRené Scharfe2016-05-311-3/+16
| * xdiff: don't trim common tail with -WRené Scharfe2016-05-312-7/+5
| * xdiff: -W: don't include common trailing empty lines in contextRené Scharfe2016-05-312-2/+4
| * xdiff: ignore empty lines before added functions with -WRené Scharfe2016-05-312-3/+21
| * xdiff: handle appended chunks better with -WRené Scharfe2016-05-312-4/+25
| * xdiff: factor out match_func_rec()René Scharfe2016-05-311-4/+11
| * t4051: rewrite, add more testsRené Scharfe2016-05-316-74/+240
* | Merge branch 'jk/rev-list-count-with-bitmap' into maintJunio C Hamano2016-06-272-1/+11
|\ \
| * | rev-list: disable bitmaps when "-n" is used with listing objectsjk/rev-list-count-with-bitmapJeff King2016-06-031-1/+2
| * | rev-list: "adjust" results of "--count --use-bitmap-index -n"Jeff King2016-06-032-0/+9
* | | Merge branch 'et/pretty-format-c-auto' into maintJunio C Hamano2016-06-272-8/+20
|\ \ \
| * | | format_commit_message: honor `color=auto` for `%C(auto)`et/pretty-format-c-autoEdward Thomson2016-05-272-8/+20
* | | | Merge branch 'ew/daemon-socket-keepalive' into maintJunio C Hamano2016-06-271-0/+14
|\ \ \ \
| * | | | daemon: enable SO_KEEPALIVE for all socketsEric Wong2016-05-251-0/+14
| | |_|/ | |/| |
* | | | Git 2.9v2.9.0Junio C Hamano2016-06-132-1/+6
* | | | Merge tag 'l10n-2.9.0-rc0' of git://github.com/git-l10n/git-poJunio C Hamano2016-06-1210-15125/+19378
|\ \ \ \
| * | | | l10n: ko.po: Update Korean translationChangwoo Ryu2016-06-121-1393/+1799
| * | | | Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin2016-06-111-1404/+1767
| |\ \ \ \
| | * | | | l10n: ru.po: update Russian translationDimitriy Ryazantcev2016-06-111-1404/+1767
| * | | | | l10n: de.po: translate 104 new messagesRalf Thielow2016-06-101-1428/+1882
| |/ / / /
| * | | | l10n: zh_CN: review for git v2.9.0 l10n round 1Ray Chen2016-06-091-15/+15
| * | | | l10n: zh_CN: for git v2.9.0 l10n round 1Jiang Xin2016-06-061-1575/+1800
| * | | | l10n: pt_PT: update Portuguese translationVasco Almeida2016-05-311-276/+322
| * | | | l10n: pt_PT: update according to git-gui glossaryVasco Almeida2016-05-311-190/+191
| * | | | l10n: pt_PT: merge git.pot fileVasco Almeida2016-05-311-1389/+1821
| * | | | l10n: Updated Bulgarian translation of git (2597t,0f,0u)Alexander Shopov2016-05-291-2034/+2655
| * | | | Merge branch 'v2.9.0_rnd1_fr' of git://github.com/jnavila/gitJiang Xin2016-05-291-1410/+1840
| |\ \ \ \
| | * | | | l10n: fr.po v2.9.0rnd1Jean-Noel Avila2016-05-261-1410/+1840
| * | | | | l10n: sv.po: Update Swedish translation (2597t0f0u)Peter Krefting2016-05-271-1412/+1857
| |/ / / /
| * | | | Merge branch 'fix_fr' of git://github.com/jnavila/gitJiang Xin2016-05-261-1/+1
| |\ \ \ \
| | * | | | l10n: fr.po Fixed grammar mistakeAntonin2016-04-281-1/+1
| * | | | | l10n: Updated Vietnamese translation (2597t)Tran Ngoc Quan2016-05-251-1405/+1869
| * | | | | l10n: git.pot: v2.9.0 round 1 (104 new, 37 removed)Jiang Xin2016-05-241-1356/+1722
* | | | | | Hopefully the final last-minute update before 2.9 finalJunio C Hamano2016-06-101-3/+7
* | | | | | Merge branch 'jk/diff-compact-heuristic'Junio C Hamano2016-06-103-1/+13
|\ \ \ \ \ \
| * | | | | | diff: disable compaction heuristic for nowjk/diff-compact-heuristicJunio C Hamano2016-06-103-1/+13
* | | | | | | Merge branch 'jk/shell-portability'Junio C Hamano2016-06-104-4/+25
|\ \ \ \ \ \ \
| * | | | | | | t5500 & t7403: lose bash-ism "local"jk/shell-portabilityJunio C Hamano2016-06-012-3/+2
| * | | | | | | test-lib: add in-shell "env" replacementJeff King2016-06-012-1/+23
* | | | | | | | Merge branch 'jc/t2300-setup'Junio C Hamano2016-06-101-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | t2300: run git-sh-setup in an environment that better mimics the real lifeJunio C Hamano2016-06-011-1/+2
| |/ / / / / / /
* | | | | | | | Git 2.9-rc2v2.9.0-rc2Junio C Hamano2016-06-062-26/+7
* | | | | | | | Sync with 2.8.4Junio C Hamano2016-06-062-1/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Git 2.8.4v2.8.4Junio C Hamano2016-06-064-3/+18