summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2016-12-20git-p4: add diff/merge properties to .gitattributes for GitLFS filesLibravatar Lars Schneider2-14/+14
2016-12-20i18n: fix misconversion in shell scriptsLibravatar Junio C Hamano2-3/+4
2016-12-20mailinfo.c: move side-effects outside of assertLibravatar Kyle J. McKay1-1/+2
2016-12-20mingw: consider that UNICODE_STRING::Length counts bytesLibravatar Max Kirillov1-1/+1
2016-12-19Second batch for 2.12Libravatar Junio C Hamano1-3/+90
2016-12-19Merge branch 'kh/tutorial-grammofix'Libravatar Junio C Hamano1-6/+6
2016-12-19Merge branch 'da/mergetool-xxdiff-hotkey'Libravatar Junio C Hamano1-5/+5
2016-12-19Merge branch 'lr/doc-fix-cet'Libravatar Junio C Hamano1-1/+1
2016-12-19Merge branch 'sb/t3600-cleanup'Libravatar Junio C Hamano1-73/+51
2016-12-19Merge branch 'jc/pull-rebase-ff'Libravatar Junio C Hamano2-4/+35
2016-12-19Merge branch 'ld/p4-worktree'Libravatar Junio C Hamano3-4/+65
2016-12-19Merge branch 'jk/make-tags-find-sources-tweak'Libravatar Junio C Hamano1-3/+16
2016-12-19Merge branch 'js/normalize-path-copy-ceil'Libravatar Junio C Hamano1-9/+14
2016-12-19Merge branch 'bb/unicode-9.0'Libravatar Junio C Hamano6-65/+163
2016-12-19Merge branch 'jk/readme-gmane-is-no-more'Libravatar Junio C Hamano1-1/+1
2016-12-19Merge branch 'jc/lock-report-on-error'Libravatar Junio C Hamano22-36/+49
2016-12-19Merge branch 'jk/xdiff-drop-xdl-fast-hash'Libravatar Junio C Hamano3-118/+0
2016-12-19Merge branch 'nd/rebase-forget'Libravatar Junio C Hamano4-4/+37
2016-12-19Merge branch 'jk/trailers-placeholder-in-pretty'Libravatar Junio C Hamano6-1/+93
2016-12-19Merge branch 'ak/commit-only-allow-empty'Libravatar Junio C Hamano3-4/+12
2016-12-19Merge branch 'da/difftool-dir-diff-fix'Libravatar Junio C Hamano2-3/+45
2016-12-19Merge branch 'jb/diff-no-index-no-abbrev'Libravatar Junio C Hamano8-1/+39
2016-12-19Merge branch 'rj/git-version-gen-do-not-force-abbrev'Libravatar Junio C Hamano1-1/+1
2016-12-19Merge branch 'jk/stash-disable-renames-internally'Libravatar Junio C Hamano2-1/+10
2016-12-19Merge branch 'jk/http-walker-limit-redirect'Libravatar Junio C Hamano2-3/+6
2016-12-19Merge branch 'jk/http-walker-limit-redirect-2.9'Libravatar Junio C Hamano9-25/+159
2016-12-19Merge branch 'nd/for-each-ref-ignore-case'Libravatar Junio C Hamano10-17/+112
2016-12-19Merge branch 'sb/unpack-trees-grammofix'Libravatar Junio C Hamano2-2/+2
2016-12-19Merge branch 'ls/travis-update-p4-and-lfs'Libravatar Junio C Hamano1-2/+2
2016-12-19Merge branch 'ls/t0021-fixup'Libravatar Junio C Hamano1-3/+2
2016-12-19Merge branch 'ah/grammos'Libravatar Junio C Hamano4-5/+5
2016-12-19Merge branch 'jc/renormalize-merge-kill-safer-crlf'Libravatar Junio C Hamano3-6/+21
2016-12-19Merge branch 'jt/use-trailer-api-in-commands'Libravatar Junio C Hamano9-198/+318
2016-12-19git-p4: fix multi-path changelist empty commitsLibravatar George Vanburgh2-3/+23
2016-12-18git-p4: avoid crash adding symlinked directoryLibravatar Luke Diamand2-6/+63
2016-12-18t0021: fix flaky testLibravatar Lars Schneider1-16/+1
2016-12-16First batch for 2.12Libravatar Junio C Hamano1-1/+34
2016-12-16Merge branch 'ls/p4-retry-thrice'Libravatar Junio C Hamano2-0/+9
2016-12-16Merge branch 'ls/p4-empty-file-on-lfs'Libravatar Junio C Hamano2-12/+19
2016-12-16Merge branch 'ld/p4-update-shelve'Libravatar Junio C Hamano3-4/+71
2016-12-16Merge branch 'vk/p4-submit-shelve'Libravatar Junio C Hamano3-14/+58
2016-12-16Merge branch 'da/mergetool-trust-exit-code'Libravatar Junio C Hamano20-38/+75
2016-12-16Merge branch 'ak/lazy-prereq-mktemp'Libravatar Junio C Hamano1-1/+2
2016-12-16Merge branch 'nd/worktree-list-fixup'Libravatar Junio C Hamano6-30/+74
2016-12-16Merge branch 'nd/qsort-in-merge-recursive'Libravatar Junio C Hamano1-9/+7
2016-12-16Merge branch 'bw/push-dry-run'Libravatar Junio C Hamano4-9/+41
2016-12-16Merge branch 'hv/submodule-not-yet-pushed-fix'Libravatar Junio C Hamano3-36/+121
2016-12-16Merge branch 'dt/empty-submodule-in-merge'Libravatar Junio C Hamano3-11/+17
2016-12-16Merge branch 'jk/rev-parse-symbolic-parents-fix'Libravatar Junio C Hamano2-1/+24
2016-12-16index-pack: skip collision check when not in repositoryLibravatar Jeff King1-4/+6