aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ab/sha1dc'Junio C Hamano2019-05-192-1/+1
|\
| * sha1dc: update from upstreamÆvar Arnfjörð Bjarmason2019-05-142-1/+1
* | Merge branch 'js/rebase-i-label-shown-in-status-fix'Junio C Hamano2019-05-191-1/+3
|\ \
| * | status: fix display of rebase -ir's `label` commandJohannes Schindelin2019-05-131-1/+3
* | | Merge branch 'es/check-non-portable-pre-5.10'Junio C Hamano2019-05-191-4/+5
|\ \ \
| * | | check-non-portable-shell: support Perl versions older than 5.10Eric Sunshine2019-05-131-4/+5
| |/ /
* | | Merge branch 'ds/trace2-document-env-vars'Junio C Hamano2019-05-191-0/+21
|\ \ \
| * | | trace2: add variable description to git.txtDerrick Stolee2019-05-131-0/+21
| |/ /
* | | Merge branch 'js/fsmonitor-refresh-after-discarding-index'Junio C Hamano2019-05-195-5/+36
|\ \ \
| * | | fsmonitor: force a refresh after the index was discardedJohannes Schindelin2019-05-084-5/+6
| * | | fsmonitor: demonstrate that it is not refreshed after discard_index()Johannes Schindelin2019-05-082-1/+31
* | | | Merge branch 'cm/notes-comment-fix'Junio C Hamano2019-05-191-5/+3
|\ \ \ \
| * | | | notes: correct documentation of format_display_notes()Chris Mayo2019-05-071-5/+3
| |/ / /
* | | | Merge branch 'tt/no-ipv6-fallback-for-winxp'Junio C Hamano2019-05-192-183/+3
|\ \ \ \
| * | | | mingw: remove obsolete IPv6-related codeTanushree Tumane2019-05-072-183/+3
* | | | | Merge branch 'js/t5580-unc-alternate-test'Junio C Hamano2019-05-191-0/+12
|\ \ \ \ \
| * | | | | t5580: verify that alternates can be UNC pathsJohannes Schindelin2019-05-071-0/+12
| | |/ / / | |/| | |
* | | | | Merge branch 'ds/cvsexportcommit-force-text'Junio C Hamano2019-05-191-0/+1
|\ \ \ \ \
| * | | | | cvsexportcommit: force crlf translationDustin Spicuzza2019-05-071-0/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'sg/ci-libsvn-perl'Junio C Hamano2019-05-191-1/+1
|\ \ \ \ \
| * | | | | ci: install 'libsvn-perl' instead of 'git-svn'SZEDER Gábor2019-05-071-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'bl/t4253-exit-code-from-format-patch'Junio C Hamano2019-05-191-2/+4
|\ \ \ \ \
| * | | | | t4253-am-keep-cr-dos: avoid using pipesBoxuan Li2019-05-071-2/+4
| |/ / / /
* | | | | Merge branch 'ds/midx-too-many-packs'Junio C Hamano2019-05-197-47/+51
|\ \ \ \ \
| * | | | | midx: add packs to packed_git linked listDerrick Stolee2019-05-074-33/+30
| * | | | | midx: pass a repository pointerDerrick Stolee2019-05-075-15/+22
| | |/ / / | |/| | |
* | | | | Merge branch 'en/unicode-in-refnames'Junio C Hamano2019-05-193-0/+7
|\ \ \ \ \
| * | | | | Honor core.precomposeUnicode in more placesElijah Newren2019-04-263-0/+7
* | | | | | Merge branch 'dl/difftool-mergetool'Junio C Hamano2019-05-199-93/+180
|\ \ \ \ \ \
| * | | | | | difftool: fallback on merge.guitoolDenton Liu2019-05-133-9/+21
| * | | | | | difftool: make --gui, --tool and --extcmd mutually exclusiveDenton Liu2019-05-132-0/+11
| * | | | | | mergetool: fallback to tool when guitool unavailableDenton Liu2019-05-133-10/+48
| * | | | | | mergetool--lib: create gui_mode functionDenton Liu2019-05-131-5/+8
| * | | | | | mergetool: use get_merge_tool functionDenton Liu2019-05-134-11/+12
| * | | | | | t7610: add mergetool --gui testsDenton Liu2019-04-251-0/+22
| * | | | | | t7610: unsuppress outputDenton Liu2019-04-251-61/+61
* | | | | | | Merge branch 'mh/http-fread-api-fix'Junio C Hamano2019-05-191-6/+6
|\ \ \ \ \ \ \
| * | | | | | | Make fread/fwrite-like functions in http.c more like fread/fwrite.Mike Hommey2019-05-081-6/+6
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'js/t6500-use-windows-pid-on-mingw'Junio C Hamano2019-05-191-1/+9
|\ \ \ \ \ \ \
| * | | | | | | t6500(mingw): use the Windows PID of the shellJohannes Schindelin2019-05-081-1/+9
* | | | | | | | Merge branch 'jk/apache-lsan'Junio C Hamano2019-05-191-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | t/lib-httpd: pass LSAN_OPTIONS through apacheJeff King2019-05-081-0/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'nd/parse-options-aliases'Junio C Hamano2019-05-195-10/+164
|\ \ \ \ \ \ \ \
| * | | | | | | | parse-options: don't emit "ambiguous option" for aliasesNguyễn Thái Ngọc Duy2019-05-075-10/+164
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'dl/branch-from-3dot-merge-base'Junio C Hamano2019-05-195-32/+50
|\ \ \ \ \ \ \ \
| * | | | | | | | branch: make create_branch accept a merge base revDenton Liu2019-05-075-6/+33
| * | | | | | | | t2018: cleanup in current testDenton Liu2019-05-071-26/+17
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'js/commit-graph-parse-leakfix'Junio C Hamano2019-05-191-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | commit-graph: fix memory leakJosh Steadmon2019-05-071-1/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/cocci-batch'Junio C Hamano2019-05-191-7/+12
|\ \ \ \ \ \ \ \