Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ab/sha1dc' | Junio C Hamano | 2019-05-19 | 2 | -1/+1 |
|\ | |||||
| * | sha1dc: update from upstream | Ævar Arnfjörð Bjarmason | 2019-05-14 | 2 | -1/+1 |
* | | Merge branch 'js/rebase-i-label-shown-in-status-fix' | Junio C Hamano | 2019-05-19 | 1 | -1/+3 |
|\ \ | |||||
| * | | status: fix display of rebase -ir's `label` command | Johannes Schindelin | 2019-05-13 | 1 | -1/+3 |
* | | | Merge branch 'es/check-non-portable-pre-5.10' | Junio C Hamano | 2019-05-19 | 1 | -4/+5 |
|\ \ \ | |||||
| * | | | check-non-portable-shell: support Perl versions older than 5.10 | Eric Sunshine | 2019-05-13 | 1 | -4/+5 |
| |/ / | |||||
* | | | Merge branch 'ds/trace2-document-env-vars' | Junio C Hamano | 2019-05-19 | 1 | -0/+21 |
|\ \ \ | |||||
| * | | | trace2: add variable description to git.txt | Derrick Stolee | 2019-05-13 | 1 | -0/+21 |
| |/ / | |||||
* | | | Merge branch 'js/fsmonitor-refresh-after-discarding-index' | Junio C Hamano | 2019-05-19 | 5 | -5/+36 |
|\ \ \ | |||||
| * | | | fsmonitor: force a refresh after the index was discarded | Johannes Schindelin | 2019-05-08 | 4 | -5/+6 |
| * | | | fsmonitor: demonstrate that it is not refreshed after discard_index() | Johannes Schindelin | 2019-05-08 | 2 | -1/+31 |
* | | | | Merge branch 'cm/notes-comment-fix' | Junio C Hamano | 2019-05-19 | 1 | -5/+3 |
|\ \ \ \ | |||||
| * | | | | notes: correct documentation of format_display_notes() | Chris Mayo | 2019-05-07 | 1 | -5/+3 |
| |/ / / | |||||
* | | | | Merge branch 'tt/no-ipv6-fallback-for-winxp' | Junio C Hamano | 2019-05-19 | 2 | -183/+3 |
|\ \ \ \ | |||||
| * | | | | mingw: remove obsolete IPv6-related code | Tanushree Tumane | 2019-05-07 | 2 | -183/+3 |
* | | | | | Merge branch 'js/t5580-unc-alternate-test' | Junio C Hamano | 2019-05-19 | 1 | -0/+12 |
|\ \ \ \ \ | |||||
| * | | | | | t5580: verify that alternates can be UNC paths | Johannes Schindelin | 2019-05-07 | 1 | -0/+12 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'ds/cvsexportcommit-force-text' | Junio C Hamano | 2019-05-19 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | cvsexportcommit: force crlf translation | Dustin Spicuzza | 2019-05-07 | 1 | -0/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'sg/ci-libsvn-perl' | Junio C Hamano | 2019-05-19 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | ci: install 'libsvn-perl' instead of 'git-svn' | SZEDER Gábor | 2019-05-07 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'bl/t4253-exit-code-from-format-patch' | Junio C Hamano | 2019-05-19 | 1 | -2/+4 |
|\ \ \ \ \ | |||||
| * | | | | | t4253-am-keep-cr-dos: avoid using pipes | Boxuan Li | 2019-05-07 | 1 | -2/+4 |
| |/ / / / | |||||
* | | | | | Merge branch 'ds/midx-too-many-packs' | Junio C Hamano | 2019-05-19 | 7 | -47/+51 |
|\ \ \ \ \ | |||||
| * | | | | | midx: add packs to packed_git linked list | Derrick Stolee | 2019-05-07 | 4 | -33/+30 |
| * | | | | | midx: pass a repository pointer | Derrick Stolee | 2019-05-07 | 5 | -15/+22 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'en/unicode-in-refnames' | Junio C Hamano | 2019-05-19 | 3 | -0/+7 |
|\ \ \ \ \ | |||||
| * | | | | | Honor core.precomposeUnicode in more places | Elijah Newren | 2019-04-26 | 3 | -0/+7 |
* | | | | | | Merge branch 'dl/difftool-mergetool' | Junio C Hamano | 2019-05-19 | 9 | -93/+180 |
|\ \ \ \ \ \ | |||||
| * | | | | | | difftool: fallback on merge.guitool | Denton Liu | 2019-05-13 | 3 | -9/+21 |
| * | | | | | | difftool: make --gui, --tool and --extcmd mutually exclusive | Denton Liu | 2019-05-13 | 2 | -0/+11 |
| * | | | | | | mergetool: fallback to tool when guitool unavailable | Denton Liu | 2019-05-13 | 3 | -10/+48 |
| * | | | | | | mergetool--lib: create gui_mode function | Denton Liu | 2019-05-13 | 1 | -5/+8 |
| * | | | | | | mergetool: use get_merge_tool function | Denton Liu | 2019-05-13 | 4 | -11/+12 |
| * | | | | | | t7610: add mergetool --gui tests | Denton Liu | 2019-04-25 | 1 | -0/+22 |
| * | | | | | | t7610: unsuppress output | Denton Liu | 2019-04-25 | 1 | -61/+61 |
* | | | | | | | Merge branch 'mh/http-fread-api-fix' | Junio C Hamano | 2019-05-19 | 1 | -6/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Make fread/fwrite-like functions in http.c more like fread/fwrite. | Mike Hommey | 2019-05-08 | 1 | -6/+6 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'js/t6500-use-windows-pid-on-mingw' | Junio C Hamano | 2019-05-19 | 1 | -1/+9 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t6500(mingw): use the Windows PID of the shell | Johannes Schindelin | 2019-05-08 | 1 | -1/+9 |
* | | | | | | | | Merge branch 'jk/apache-lsan' | Junio C Hamano | 2019-05-19 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t/lib-httpd: pass LSAN_OPTIONS through apache | Jeff King | 2019-05-08 | 1 | -0/+1 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'nd/parse-options-aliases' | Junio C Hamano | 2019-05-19 | 5 | -10/+164 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | parse-options: don't emit "ambiguous option" for aliases | Nguyễn Thái Ngọc Duy | 2019-05-07 | 5 | -10/+164 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'dl/branch-from-3dot-merge-base' | Junio C Hamano | 2019-05-19 | 5 | -32/+50 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | branch: make create_branch accept a merge base rev | Denton Liu | 2019-05-07 | 5 | -6/+33 |
| * | | | | | | | | t2018: cleanup in current test | Denton Liu | 2019-05-07 | 1 | -26/+17 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'js/commit-graph-parse-leakfix' | Junio C Hamano | 2019-05-19 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | commit-graph: fix memory leak | Josh Steadmon | 2019-05-07 | 1 | -1/+3 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jk/cocci-batch' | Junio C Hamano | 2019-05-19 | 1 | -7/+12 |
|\ \ \ \ \ \ \ \ |