summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2016-09-27xdiff: rename "struct group" to "struct xdlgroup"Libravatar Jeff King1-7/+7
2016-09-19blame: honor the diff heuristic options and configLibravatar Michael Haggerty8-19/+70
2016-09-19parse-options: add parse_opt_unknown_cb()Libravatar Michael Haggerty2-0/+13
2016-09-19diff: improve positioning of add/delete blocks in diffsLibravatar Michael Haggerty7-11/+546
2016-08-23xdl_change_compact(): introduce the concept of a change groupLibravatar Michael Haggerty1-90/+203
2016-08-23recs_match(): take two xrecord_t pointers as argumentsLibravatar Michael Haggerty1-7/+7
2016-08-23is_blank_line(): take a single xrecord_t as argumentLibravatar Michael Haggerty1-4/+4
2016-08-23xdl_change_compact(): only use heuristic if group can't be matchedLibravatar Michael Haggerty1-19/+19
2016-08-23xdl_change_compact(): fix compaction heuristic to adjust ixoLibravatar Michael Haggerty1-0/+1
2016-07-06Merge branch 'jk/add-i-diff-compact-heuristics'Libravatar Junio C Hamano1-0/+4
2016-07-06Merge branch 'km/fetch-do-not-free-remote-name'Libravatar Junio C Hamano1-4/+2
2016-07-06Merge branch 'nd/test-lib-httpd-show-error-log-in-verbose'Libravatar Junio C Hamano1-0/+1
2016-07-06Merge branch 'jk/string-list-static-init'Libravatar Junio C Hamano11-21/+24
2016-07-06Merge branch 'jk/send-pack-stdio'Libravatar Junio C Hamano3-29/+16
2016-07-06Merge branch 'pb/commit-editmsg-path'Libravatar Junio C Hamano1-7/+8
2016-07-06Merge branch 'ep/http-curl-trace'Libravatar Junio C Hamano4-2/+133
2016-06-27Second batch of topics for 2.10Libravatar Junio C Hamano1-0/+65
2016-06-27Sync with maintLibravatar Junio C Hamano1-0/+28
2016-06-27Start preparing for 2.9.1Libravatar Junio C Hamano2-1/+29
2016-06-27Merge branch 'tb/complete-status'Libravatar Junio C Hamano1-1/+97
2016-06-27Merge branch 'mg/cherry-pick-multi-on-unborn'Libravatar Junio C Hamano1-5/+6
2016-06-27Merge branch 'lf/receive-pack-auto-gc-to-client'Libravatar Junio C Hamano1-2/+13
2016-06-27Merge branch 'em/newer-freebsd-shells-are-fine-with-returns'Libravatar Junio C Hamano3-6/+6
2016-06-27Merge branch 'lv/status-say-working-tree-not-directory'Libravatar Junio C Hamano1-1/+1
2016-06-27Merge branch 'nb/gnome-keyring-build'Libravatar Junio C Hamano1-2/+3
2016-06-27Merge branch 'jc/deref-tag'Libravatar Junio C Hamano2-6/+3
2016-06-27Merge branch 'et/add-chmod-x'Libravatar Junio C Hamano6-20/+68
2016-06-27Merge branch 'jk/avoid-unbounded-alloca'Libravatar Junio C Hamano1-6/+16
2016-06-27Merge branch 'rj/compat-regex-size-max-fix'Libravatar Junio C Hamano2-2/+1
2016-06-27Merge branch 'vs/prompt-avoid-unset-variable'Libravatar Junio C Hamano1-3/+3
2016-06-27Merge branch 'sg/reflog-past-root'Libravatar Junio C Hamano3-1/+29
2016-06-27Merge branch 'pb/strbuf-read-file-doc'Libravatar Junio C Hamano1-0/+2
2016-06-27Merge branch 'dn/gpg-doc'Libravatar Junio C Hamano2-2/+2
2016-06-27Merge branch 'jk/fetch-prune-doc'Libravatar Junio C Hamano1-1/+1
2016-06-27Merge branch 'ap/git-svn-propset-doc'Libravatar Junio C Hamano1-0/+14
2016-06-27Merge branch 'tr/doc-tt'Libravatar Junio C Hamano36-217/+224
2016-06-27Merge branch 'pc/occurred'Libravatar Junio C Hamano2-2/+2
2016-06-27Merge branch 'cc/apply-introduce-state'Libravatar Junio C Hamano1-609/+820
2016-06-27Merge branch 'rs/xdiff-hunk-with-func-line' into maintLibravatar Junio C Hamano10-93/+365
2016-06-27Merge branch 'jk/rev-list-count-with-bitmap' into maintLibravatar Junio C Hamano2-1/+11
2016-06-27Merge branch 'et/pretty-format-c-auto' into maintLibravatar Junio C Hamano2-8/+20
2016-06-27Merge branch 'ew/daemon-socket-keepalive' into maintLibravatar Junio C Hamano1-0/+14
2016-06-22git-svn: skip mergeinfo handling with --no-follow-parentLibravatar Eric Wong1-9/+16
2016-06-20Start the post-2.9 cycleLibravatar Junio C Hamano3-2/+70
2016-06-20Merge branch 'rs/xdiff-hunk-with-func-line'Libravatar Junio C Hamano10-93/+365
2016-06-20Merge branch 'jk/rev-list-count-with-bitmap'Libravatar Junio C Hamano2-1/+11
2016-06-20Merge branch 'wd/userdiff-css'Libravatar Junio C Hamano15-0/+90
2016-06-20Merge branch 'jc/clear-pathspec'Libravatar Junio C Hamano10-15/+15
2016-06-20Merge branch 'aq/upload-pack-use-parse-options'Libravatar Junio C Hamano2-36/+37
2016-06-20Merge branch 'jg/dash-is-last-branch-in-worktree-add'Libravatar Junio C Hamano3-1/+21