summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2017-01-17Merge branch 'jk/difftool-in-subdir' into maintLibravatar Junio C Hamano1-24/+29
2017-01-17Merge branch 'ld/p4-compare-dir-vs-symlink' into maintLibravatar Junio C Hamano2-6/+63
2017-01-17Merge branch 'jc/push-default-explicit' into maintLibravatar Junio C Hamano2-2/+15
2017-01-17Merge branch 'jt/mailinfo-fold-in-body-headers' into maintLibravatar Junio C Hamano1-1/+2
2017-01-17Merge branch 'jk/index-pack-wo-repo-from-stdin' into maintLibravatar Junio C Hamano7-47/+42
2017-01-17Merge branch 'jk/parseopt-usage-msg-opt' into maintLibravatar Junio C Hamano1-1/+1
2017-01-17Merge branch 'jk/quote-env-path-list-component' into maintLibravatar Junio C Hamano5-12/+102
2017-01-17Merge branch 'nd/shallow-fixup' into maintLibravatar Junio C Hamano1-19/+20
2017-01-17Merge branch 'sb/sequencer-abort-safety' into maintLibravatar Junio C Hamano3-2/+61
2017-01-17Merge branch 'da/mergetool-xxdiff-hotkey' into maintLibravatar Junio C Hamano1-5/+5
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-21t5615-alternate-env: double-quotes in file names do not work on WindowsLibravatar Johannes Sixt1-1/+1
2016-12-20mailinfo.c: move side-effects outside of assertLibravatar Kyle J. McKay1-1/+2
2016-12-18git-p4: avoid crash adding symlinked directoryLibravatar Luke Diamand2-6/+63
2016-12-16index-pack: skip collision check when not in repositoryLibravatar Jeff King1-4/+6
2016-12-16normalize_path_copy(): fix pushing to //server/share/dir on WindowsLibravatar Johannes Sixt1-9/+14
2016-12-16t: use nongit() function where applicableLibravatar Jeff King3-29/+5
2016-12-16index-pack: complain when --stdin is used outside of a repoLibravatar Jeff King2-0/+17
2016-12-16t5000: extract nongit function to test-lib-functions.shLibravatar Jeff King2-14/+14
2016-12-14Revert "sequencer: remove useless get_dir() function"Libravatar Junio C Hamano1-1/+6
2016-12-14parse-options: print "fatal:" before usage_msg_opt()Libravatar Jeff King1-1/+1
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-13t5547-push-quarantine: run the path separator test on Windows, tooLibravatar Johannes Sixt1-4/+10
2016-12-12tmp-objdir: quote paths we add to alternatesLibravatar Jeff King2-1/+36
2016-12-12alternates: accept double-quoted pathsLibravatar Jeff King3-11/+60