summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2017-01-17Merge branch 'jc/pull-rebase-ff' into maintLibravatar Junio C Hamano2-4/+35
2017-01-17Merge branch 'js/normalize-path-copy-ceil' into maintLibravatar Junio C Hamano1-9/+14
2017-01-17Merge branch 'ak/commit-only-allow-empty' into maintLibravatar Junio C Hamano3-4/+12
2017-01-17Merge branch 'da/difftool-dir-diff-fix' into maintLibravatar Junio C Hamano2-3/+45
2017-01-17Merge branch 'jb/diff-no-index-no-abbrev' into maintLibravatar Junio C Hamano8-1/+39
2017-01-17Merge branch 'jk/stash-disable-renames-internally' into maintLibravatar Junio C Hamano2-1/+10
2017-01-17Merge branch 'jk/http-walker-limit-redirect' into maintLibravatar Junio C Hamano9-28/+165
2017-01-17Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maintLibravatar Junio C Hamano3-6/+21
2017-01-17Merge branch 'ls/p4-empty-file-on-lfs' into maintLibravatar Junio C Hamano2-12/+19
2017-01-17Merge branch 'da/mergetool-trust-exit-code' into maintLibravatar Junio C Hamano20-38/+75
2017-01-17Merge branch 'nd/worktree-list-fixup' into maintLibravatar Junio C Hamano6-30/+74
2017-01-17Merge branch 'bw/push-dry-run' into maintLibravatar Junio C Hamano4-9/+41
2017-01-17Merge branch 'hv/submodule-not-yet-pushed-fix' into maintLibravatar Junio C Hamano3-36/+121
2017-01-17Merge branch 'dt/empty-submodule-in-merge' into maintLibravatar Junio C Hamano3-11/+17
2017-01-17Merge branch 'jk/rev-parse-symbolic-parents-fix' into maintLibravatar Junio C Hamano2-1/+24
2017-01-17Merge branch 'js/mingw-isatty' into maintLibravatar Junio C Hamano2-86/+92
2017-01-17Merge branch 'bb/unicode-9.0' into maintLibravatar Junio C Hamano6-65/+163
2017-01-17Merge branch 'ls/travis-update-p4-and-lfs' into maintLibravatar Junio C Hamano1-2/+2
2016-12-22mingw: replace isatty() hackLibravatar Jeff Hostetler1-107/+69
2016-12-22mingw: fix colourization on Cygwin pseudo terminalsLibravatar Alan Davies1-2/+6
2016-12-22mingw: adjust is_console() to work with stdinLibravatar Johannes Schindelin1-1/+5
2016-12-16normalize_path_copy(): fix pushing to //server/share/dir on WindowsLibravatar Johannes Sixt1-9/+14
2016-12-14unicode_width.h: update the width tables to Unicode 9.0Libravatar Beat Bolli1-24/+107
2016-12-14update_unicode.sh: remove the plane filterLibravatar Beat Bolli1-2/+1
2016-12-14update_unicode.sh: automatically download newer definition filesLibravatar Beat Bolli1-6/+2
2016-12-13update_unicode.sh: pin the uniset repo to a known good commitLibravatar Beat Bolli1-1/+2
2016-12-13update_unicode.sh: remove an unnecessary subshell levelLibravatar Beat Bolli1-27/+26
2016-12-13update_unicode.sh: move it into contrib/update-unicodeLibravatar Beat Bolli4-6/+26
2016-12-11mingw: intercept isatty() to handle /dev/null as Git expects itLibravatar Johannes Schindelin2-0/+36
2016-12-09commit: remove 'Clever' message for --only --amendLibravatar Andreas Krey1-2/+0
2016-12-08diff: handle --no-abbrev in no-index caseLibravatar Jack Bates8-1/+39
2016-12-08difftool: fix dir-diff index creation when in a subdirectoryLibravatar David Aguilar2-3/+45
2016-12-06stash: prefer plumbing over git-diffLibravatar Jeff King2-1/+10
2016-12-06http-walker: complain about non-404 loose object errorsLibravatar Jeff King2-3/+6
2016-12-06Merge branch 'ew/http-walker' into jk/http-walker-limit-redirectLibravatar Junio C Hamano3-31/+206
2016-12-06http: treat http-alternates like redirectsLibravatar Jeff King3-3/+44
2016-12-06http: make redirects more obviousLibravatar Jeff King6-3/+81
2016-12-06remote-curl: rename shadowed options variableLibravatar Jeff King1-9/+9
2016-12-06http: always update the base URL for redirectsLibravatar Jeff King4-4/+21
2016-12-06http: simplify update_url_from_redirectLibravatar Jeff King1-6/+4
2016-12-05git-p4: fix empty file processing for large file system backend GitLFSLibravatar Lars Schneider2-12/+19
2016-12-05travis-ci: update P4 to 16.2 and GitLFS to 1.5.2 in Linux buildLibravatar Lars Schneider1-2/+2
2016-12-05commit: make --only --allow-empty work without pathsLibravatar Andreas Krey3-2/+12
2016-12-05Sync with maint-2.10Libravatar Junio C Hamano1-0/+48
2016-12-05preparing for 2.10.3Libravatar Junio C Hamano2-1/+49
2016-12-05Merge branch 'jk/common-main' into maint-2.10Libravatar Junio C Hamano5-11/+12
2016-12-01convert: git cherry-pick -Xrenormalize did not workLibravatar Torsten Bögershausen1-6/+7
2016-12-01Merge branch 'tb/t0027-raciness-fix' into jc/renormalize-merge-kill-safer-crlfLibravatar Junio C Hamano2-43/+60
2016-11-29pull: fast-forward "pull --rebase=true"Libravatar Junio C Hamano2-4/+35
2016-11-29Merge branch 'tk/diffcore-delta-remove-unused' into maintLibravatar Junio C Hamano5-8/+1