summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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
2017-01-10Fifth batch 2.12Libravatar Junio C Hamano1-0/+45
2017-01-10Merge branch 'sb/submodule-embed-gitdir'Libravatar Junio C Hamano12-43/+399
2017-01-10Merge branch 'jc/retire-compaction-heuristics'Libravatar Junio C Hamano7-67/+8
2017-01-10Merge branch 'nd/config-misc-fixes'Libravatar Junio C Hamano1-5/+15
2017-01-10Merge branch 'jc/abbrev-autoscale-config'Libravatar Junio C Hamano2-8/+15
2017-01-10Merge branch 'mh/fast-import-notes-fix-new'Libravatar Junio C Hamano2-3/+47
2017-01-10Merge branch 'jc/git-open-cloexec'Libravatar Junio C Hamano3-36/+22
2017-01-10Merge branch 'jc/compression-config'Libravatar Junio C Hamano9-31/+158
2017-01-10Merge branch 'dt/smart-http-detect-server-going-away'Libravatar Junio C Hamano5-4/+77
2017-01-10Merge branch 'mm/gc-safety-doc'Libravatar Junio C Hamano2-9/+29
2017-01-10Merge branch 'mm/push-social-engineering-attack-doc'Libravatar Junio C Hamano6-22/+51
2017-01-10Merge branch 'jt/fetch-no-redundant-tag-fetch-map'Libravatar Junio C Hamano1-3/+0
2017-01-10Merge branch 'jc/latin-1'Libravatar Junio C Hamano1-11/+25
2017-01-07blame: output porcelain "previous" header for each fileLibravatar Jeff King2-9/+131
2017-01-07blame: handle --no-abbrevLibravatar Jeff King2-0/+6
2017-01-07blame: fix alignment with --abbrev=40Libravatar Jeff King2-1/+29
2017-01-07archive-zip: load userdiff configLibravatar Jeff King2-4/+25
2016-12-31gitk: ru.po: Update Russian translationLibravatar Dimitriy Ryazantcev1-314/+356
2016-12-29git-p4: do not pass '-r 0' to p4 commandsLibravatar Igor Kushnir2-1/+5
2016-12-29repack: die on incremental + write-bitmap-indexLibravatar David Turner2-5/+12
2016-12-29auto gc: don't write bitmaps for incremental repacksLibravatar David Turner2-1/+33
2016-12-27rm: absorb a submodules git dir before deletionLibravatar Stefan Beller2-87/+36
2016-12-27submodule: rename and add flags to ok_to_remove_submoduleLibravatar Stefan Beller3-14/+45
2016-12-27submodule: modernize ok_to_remove_submodule to use argv_arrayLibravatar Stefan Beller1-10/+4
2016-12-27submodule.h: add extern keyword to functionsLibravatar Stefan Beller1-25/+30
2016-12-27worktree: initialize return value for submodule_uses_worktreesLibravatar Stefan Beller1-1/+1
2016-12-27Fourth batch for 2.12Libravatar Junio C Hamano1-0/+42
2016-12-27Merge branch 'jc/lock-report-on-error'Libravatar Junio C Hamano1-1/+1
2016-12-27lockfile: move REPORT_ON_ERROR bit elsewhereLibravatar Junio C Hamano1-1/+1
2016-12-27Merge branch 'js/mingw-isatty'Libravatar Junio C Hamano1-114/+84
2016-12-27Merge branch 'ls/p4-lfs'Libravatar Junio C Hamano2-14/+14
2016-12-27Merge branch 'va/i18n-even-more'Libravatar Junio C Hamano2-3/+4
2016-12-27Merge branch 'lt/shortlog-by-committer'Libravatar Junio C Hamano4-3/+36
2016-12-27Merge branch 'mk/mingw-winansi-ttyname-termination-fix'Libravatar Junio C Hamano1-1/+1
2016-12-27Merge branch 'gv/p4-multi-path-commit-fix'Libravatar Junio C Hamano2-3/+23
2016-12-27Merge branch 'jk/difftool-in-subdir'Libravatar Junio C Hamano1-24/+29
2016-12-27Merge branch 'ld/p4-compare-dir-vs-symlink'Libravatar Junio C Hamano2-6/+63
2016-12-27Merge branch 'ls/filter-process'Libravatar Junio C Hamano4-29/+24
2016-12-27Merge branch 'bw/transport-protocol-policy'Libravatar Junio C Hamano12-85/+362
2016-12-27Merge branch 'cp/merge-continue'Libravatar Junio C Hamano4-1/+45
2016-12-27Merge branch 'va/i18n-perl-scripts'Libravatar Junio C Hamano8-218/+408
2016-12-27Merge branch 'sb/submodule-config-cleanup'Libravatar Junio C Hamano4-42/+48
2016-12-27Merge branch 'jc/push-default-explicit'Libravatar Junio C Hamano2-2/+15
2016-12-23diff: retire "compaction" heuristicsLibravatar Junio C Hamano7-67/+8
2016-12-22config.abbrev: document the new default that auto-scalesLibravatar Junio C Hamano2-8/+15
2016-12-22config.c: handle lock file in error case in git_config_rename_...Libravatar Nguyễn Thái Ngọc Duy1-1/+3