summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2014-06-25Merge branch 'fc/rerere-conflict-style' into maintLibravatar Junio C Hamano1-0/+2
2014-06-25Merge branch 'rs/pack-objects-no-unnecessary-realloc' into maintLibravatar Junio C Hamano1-2/+2
2014-06-25Merge branch 'dt/merge-recursive-case-insensitive' into maintLibravatar Junio C Hamano3-1/+61
2014-06-25Merge branch 'rs/mailinfo-header-cmp' into maintLibravatar Junio C Hamano1-3/+3
2014-06-25Merge branch 'jk/index-pack-report-missing' into maintLibravatar Junio C Hamano1-2/+7
2014-06-25Merge branch 'nd/index-pack-one-fd-per-thread' into maintLibravatar Junio C Hamano3-18/+17
2014-06-25Merge branch 'sk/spawn-less-case-insensitively-from-grep-O-i' into maintLibravatar Junio C Hamano1-0/+3
2014-06-25Merge branch 'nd/daemonize-gc' into maintLibravatar Junio C Hamano1-6/+20
2014-06-25Merge branch 'jk/diff-follow-must-take-one-pathspec' into maintLibravatar Junio C Hamano2-6/+5
2014-06-25Merge branch 'jk/diff-files-assume-unchanged' into maintLibravatar Junio C Hamano2-12/+32
2014-06-25Merge branch 'jk/commit-C-pick-empty' into maintLibravatar Junio C Hamano2-4/+12
2014-06-25Merge branch 'bc/blame-crlf-test' into maintLibravatar Junio C Hamano2-1/+9
2014-06-25Merge branch 'jx/blame-align-relative-time' into maintLibravatar Junio C Hamano1-8/+22
2014-06-25Merge branch 'jc/apply-ignore-whitespace' into maintLibravatar Junio C Hamano2-13/+11
2014-06-25Merge branch 'jk/complete-merge-pull' into maintLibravatar Junio C Hamano1-1/+5
2014-06-25Merge branch 'ow/config-mailmap-pathname' into maintLibravatar Junio C Hamano1-1/+1
2014-06-25Merge branch 'as/pretty-truncate' into maintLibravatar Junio C Hamano5-72/+282
2014-06-25Merge branch 'jc/revision-dash-count-parsing' into maintLibravatar Junio C Hamano1-2/+4
2014-06-25Merge branch 'jk/report-fail-to-read-objects-better' into maintLibravatar Junio C Hamano1-1/+5
2014-06-25Merge branch 'mn/sideband-no-ansi' into maintLibravatar Junio C Hamano1-1/+1
2014-06-25Merge branch 'je/pager-do-not-recurse' into maintLibravatar Junio C Hamano1-1/+1
2014-06-12Merge branch 'jc/rev-parse-argh-dashed-multi-words' into maintLibravatar Junio C Hamano2-0/+7
2014-06-12pull: do not abuse 'break' inside a shell 'case'Libravatar Jacek Konieczny1-2/+0
2014-06-09revision: parse "git log -<count>" more carefullyLibravatar Junio C Hamano1-2/+4
2014-06-04update-index: fix segfault with missing --cacheinfo argumentLibravatar Jeff King2-0/+7
2014-06-02pack-objects: use free()+xcalloc() instead of xrealloc()+memset()Libravatar René Scharfe1-2/+2
2014-06-02mailinfo: use strcmp() for string comparisonLibravatar René Scharfe1-3/+3
2014-06-02sideband.c: do not use ANSI control sequence on non-terminalLibravatar Michael Naumov1-1/+1
2014-05-30Sync with 1.9.4Libravatar Junio C Hamano2-1/+18
2014-05-30Git 1.9.4Libravatar Junio C Hamano4-3/+20
2014-05-30t5537: re-drop http testsLibravatar Jeff King1-28/+0
2014-05-28Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maintLibravatar Junio C Hamano2-20/+42
2014-05-28Merge branch 'mw/symlinks' into maintLibravatar Junio C Hamano3-20/+112
2014-05-28Git 2.0Libravatar Junio C Hamano2-1/+6
2014-05-27config: respect '~' and '~user' in mailmap.fileLibravatar Øystein Walle1-1/+1
2014-05-27gc --auto: do not lock refs in the backgroundLibravatar Nguyễn Thái Ngọc Duy1-6/+20
2014-05-27completion: add missing options for git-mergeLibravatar John Keeping1-1/+4
2014-05-27completion: add a note that merge options are sharedLibravatar John Keeping1-0/+1
2014-05-21Update draft release notes to 2.0Libravatar Junio C Hamano1-9/+5
2014-05-21pretty.c: format string with truncate respects logOutputEncodingLibravatar Alexey Shumkin3-8/+13
2014-05-21t4205, t6006: add tests that fail with i18n.logOutputEncoding setLibravatar Alexey Shumkin2-2/+213
2014-05-21t4205 (log-pretty-format): use `tformat` rather than `format`Libravatar Alexey Shumkin1-39/+13
2014-05-21t4041, t4205, t6006, t7102: don't hardcode tested encoding valueLibravatar Alexey Shumkin4-27/+39
2014-05-20Git 2.0-rc4Libravatar Junio C Hamano1-1/+1
2014-05-20RelNotes/2.0.0.txt: Fix several grammar issues, notably a lack of hyphens, do...Libravatar Jason St. John1-36/+37
2014-05-20Revert "Merge branch 'jc/graduate-remote-hg-bzr' (early part)"Libravatar Junio C Hamano11-4360/+87
2014-05-20move "--follow needs one pathspec" rule to diff_setup_doneLibravatar Jeff King2-6/+5
2014-05-19Merge branch 'jc/graduate-remote-hg-bzr' (early part)Libravatar Junio C Hamano6-71/+62
2014-05-19remote-helpers: point at their upstream repositoriesLibravatar Junio C Hamano1-0/+19
2014-05-19contrib: remote-helpers: add move warnings (v2.0)Libravatar Felipe Contreras2-0/+6