summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* mingw: fix the shortlog --output=<file> testjs/log-to-diffopt-fileJohannes Schindelin2016-07-111-2/+2
* diff: do not color output when --color=auto and --output=<file> is givenJohannes Schindelin2016-06-281-0/+2
* t4211: ensure that log respects --output=<file>Johannes Schindelin2016-06-241-0/+7
* shortlog: respect the --output=<file> settingJohannes Schindelin2016-06-242-1/+9
* format-patch: use stdout directlyJohannes Schindelin2016-06-241-5/+1
* format-patch: avoid freopen()Johannes Schindelin2016-06-241-31/+33
* format-patch: explicitly switch off color when writing to filesJohannes Schindelin2016-06-241-0/+2
* shortlog: support outputting to streams other than stdoutJohannes Schindelin2016-06-242-5/+9
* graph: respect the diffopt.file settingJohannes Schindelin2016-06-241-13/+17
* line-log: respect diffopt's configured output file streamJohannes Schindelin2016-06-241-17/+17
* log-tree: respect diffopt's configured output file streamJohannes Schindelin2016-06-241-32/+32
* log: prepare log/log-tree to reuse the diffopt.close_file attributeJohannes Schindelin2016-06-242-4/+16
* Start the post-2.9 cycleJunio C Hamano2016-06-203-2/+70
* Merge branch 'rs/xdiff-hunk-with-func-line'Junio C Hamano2016-06-2010-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'Junio C Hamano2016-06-202-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 'wd/userdiff-css'Junio C Hamano2016-06-2015-0/+90
|\ \ \
| * | | userdiff: add built-in pattern for CSSwd/userdiff-cssWilliam Duclot2016-06-0315-0/+90
* | | | Merge branch 'jc/clear-pathspec'Junio C Hamano2016-06-2010-15/+15
|\ \ \ \
| * | | | pathspec: rename free_pathspec() to clear_pathspec()jc/clear-pathspecJunio C Hamano2016-06-0210-15/+15
* | | | | Merge branch 'aq/upload-pack-use-parse-options'Junio C Hamano2016-06-202-36/+37
|\ \ \ \ \
| * | | | | upload-pack.c: use parse-options APIaq/upload-pack-use-parse-optionsAntoine Queru2016-05-312-36/+37
* | | | | | Merge branch 'jg/dash-is-last-branch-in-worktree-add'Junio C Hamano2016-06-203-1/+21
|\ \ \ \ \ \
| * | | | | | worktree: allow "-" short-hand for @{-1} in add commandjg/dash-is-last-branch-in-worktree-addJordan DE GEA2016-05-313-1/+21
| |/ / / / /
* | | | | | Merge branch 'et/pretty-format-c-auto'Junio C Hamano2016-06-202-8/+20
|\ \ \ \ \ \
| * | | | | | format_commit_message: honor `color=auto` for `%C(auto)`et/pretty-format-c-autoEdward Thomson2016-05-272-8/+20
* | | | | | | Merge branch 'sb/submodule-recommend-shallowness'Junio C Hamano2016-06-206-4/+85
|\ \ \ \ \ \ \
| * | | | | | | submodule update: learn `--[no-]recommend-shallow` optionStefan Beller2016-05-274-4/+75
| * | | | | | | submodule-config: keep shallow recommendation aroundStefan Beller2016-05-272-0/+10
* | | | | | | | Merge branch 'sb/submodule-misc-cleanups'Junio C Hamano2016-06-201-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | submodule update: make use of the existing fetch_in_submodule functionsb/submodule-misc-cleanupsStefan Beller2016-05-251-1/+1
* | | | | | | | | Merge branch 'ew/daemon-socket-keepalive'Junio C Hamano2016-06-201-0/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | daemon: enable SO_KEEPALIVE for all socketsEric Wong2016-05-251-0/+14
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'ah/no-verify-signature-with-pull-rebase'Junio C Hamano2016-06-202-0/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pull: warn on --verify-signatures with --rebaseah/no-verify-signature-with-pull-rebaseAlexander Hirsch2016-05-202-0/+19
* | | | | | | | | | Merge branch 'ew/fast-import-unpack-limit'Junio C Hamano2016-06-205-0/+179
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fast-import: invalidate pack_id references after looseningew/fast-import-unpack-limitEric Wong2016-05-292-1/+87
| * | | | | | | | | | fast-import: implement unpack limitEric Wong2016-05-115-0/+93
* | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \