aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'rs/xdiff-hunk-with-func-line' into maintJunio C Hamano2016-06-27
|\
| * xdiff: fix merging of appended hunk with -WRené Scharfe2016-06-09
| * grep: -W: don't extend context to trailing empty linesRené Scharfe2016-05-31
| * t7810: add test for grep -W and trailing empty context linesRené Scharfe2016-05-31
| * xdiff: don't trim common tail with -WRené Scharfe2016-05-31
| * xdiff: -W: don't include common trailing empty lines in contextRené Scharfe2016-05-31
| * xdiff: ignore empty lines before added functions with -WRené Scharfe2016-05-31
| * xdiff: handle appended chunks better with -WRené Scharfe2016-05-31
| * xdiff: factor out match_func_rec()René Scharfe2016-05-31
| * t4051: rewrite, add more testsRené Scharfe2016-05-31
* | Merge branch 'jk/rev-list-count-with-bitmap' into maintJunio C Hamano2016-06-27
|\ \
| * | rev-list: disable bitmaps when "-n" is used with listing objectsJeff King2016-06-03
| * | rev-list: "adjust" results of "--count --use-bitmap-index -n"Jeff King2016-06-03
* | | Merge branch 'et/pretty-format-c-auto' into maintJunio C Hamano2016-06-27
|\ \ \
| * | | format_commit_message: honor `color=auto` for `%C(auto)`Edward Thomson2016-05-27
* | | | Merge branch 'ew/daemon-socket-keepalive' into maintJunio C Hamano2016-06-27
|\ \ \ \
| * | | | daemon: enable SO_KEEPALIVE for all socketsEric Wong2016-05-25
| | |_|/ | |/| |
* | | | Git 2.9v2.9.0Junio C Hamano2016-06-13
* | | | Merge tag 'l10n-2.9.0-rc0' of git://github.com/git-l10n/git-poJunio C Hamano2016-06-12
|\ \ \ \
| * | | | l10n: ko.po: Update Korean translationChangwoo Ryu2016-06-12
| * | | | Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin2016-06-11
| |\ \ \ \
| | * | | | l10n: ru.po: update Russian translationDimitriy Ryazantcev2016-06-11
| * | | | | l10n: de.po: translate 104 new messagesRalf Thielow2016-06-10
| |/ / / /
| * | | | l10n: zh_CN: review for git v2.9.0 l10n round 1Ray Chen2016-06-09
| * | | | l10n: zh_CN: for git v2.9.0 l10n round 1Jiang Xin2016-06-06
| * | | | l10n: pt_PT: update Portuguese translationVasco Almeida2016-05-31
| * | | | l10n: pt_PT: update according to git-gui glossaryVasco Almeida2016-05-31
| * | | | l10n: pt_PT: merge git.pot fileVasco Almeida2016-05-31
| * | | | l10n: Updated Bulgarian translation of git (2597t,0f,0u)Alexander Shopov2016-05-29
| * | | | Merge branch 'v2.9.0_rnd1_fr' of git://github.com/jnavila/gitJiang Xin2016-05-29
| |\ \ \ \
| | * | | | l10n: fr.po v2.9.0rnd1Jean-Noel Avila2016-05-26
| * | | | | l10n: sv.po: Update Swedish translation (2597t0f0u)Peter Krefting2016-05-27
| |/ / / /
| * | | | Merge branch 'fix_fr' of git://github.com/jnavila/gitJiang Xin2016-05-26
| |\ \ \ \
| | * | | | l10n: fr.po Fixed grammar mistakeAntonin2016-04-28
| * | | | | l10n: Updated Vietnamese translation (2597t)Tran Ngoc Quan2016-05-25
| * | | | | l10n: git.pot: v2.9.0 round 1 (104 new, 37 removed)Jiang Xin2016-05-24
* | | | | | Hopefully the final last-minute update before 2.9 finalJunio C Hamano2016-06-10
* | | | | | Merge branch 'jk/diff-compact-heuristic'Junio C Hamano2016-06-10
|\ \ \ \ \ \
| * | | | | | diff: disable compaction heuristic for nowJunio C Hamano2016-06-10
* | | | | | | Merge branch 'jk/shell-portability'Junio C Hamano2016-06-10
|\ \ \ \ \ \ \
| * | | | | | | t5500 & t7403: lose bash-ism "local"Junio C Hamano2016-06-01
| * | | | | | | test-lib: add in-shell "env" replacementJeff King2016-06-01
* | | | | | | | Merge branch 'jc/t2300-setup'Junio C Hamano2016-06-10
|\ \ \ \ \ \ \ \
| * | | | | | | | t2300: run git-sh-setup in an environment that better mimics the real lifeJunio C Hamano2016-06-01
| |/ / / / / / /
* | | | | | | | Git 2.9-rc2v2.9.0-rc2Junio C Hamano2016-06-06
* | | | | | | | Sync with 2.8.4Junio C Hamano2016-06-06
|\ \ \ \ \ \ \ \
| * | | | | | | | Git 2.8.4v2.8.4Junio C Hamano2016-06-06
| * | | | | | | | Merge branch 'kb/msys2-tty' into maintJunio C Hamano2016-06-06
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'da/difftool' into maintJunio C Hamano2016-06-06
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'tb/core-eol-fix' into maintJunio C Hamano2016-06-06
| |\ \ \ \ \ \ \ \ \ \