summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2015-06-11Merge branch 'tb/complete-sequencing'Libravatar Junio C Hamano1-0/+5
2015-06-11Merge branch 'jk/squelch-missing-link-warning-for-unreachable'Libravatar Junio C Hamano7-9/+34
2015-06-11Merge branch 'pt/pull-tests'Libravatar Junio C Hamano2-36/+175
2015-06-11Merge branch 'sb/glossary-submodule'Libravatar Junio C Hamano1-0/+16
2015-06-11Merge branch 'sb/submodule-doc-intro'Libravatar Junio C Hamano1-28/+22
2015-06-11Merge branch 'jk/diagnose-config-mmap-failure'Libravatar Junio C Hamano4-11/+29
2015-06-11Merge branch 'mt/p4-depotFile-at-version'Libravatar Junio C Hamano1-1/+1
2015-06-11Merge branch 'mh/verify-lock-error-report'Libravatar Junio C Hamano2-21/+33
2015-06-11Merge branch 'jk/color-diff-plain-is-context'Libravatar Junio C Hamano5-23/+24
2015-06-11Merge branch 'jk/clone-dissociate'Libravatar Junio C Hamano1-13/+4
2015-06-11Merge branch 'jc/diff-ws-error-highlight'Libravatar Junio C Hamano4-260/+385
2015-06-10doc: format-patch: fix typoLibravatar Frans Klaver1-1/+1
2015-06-10git-p4: fixing --changes-block-size handlingLibravatar Luke Diamand2-28/+69
2015-06-10git-p4: add tests for non-numeric revision rangeLibravatar Luke Diamand1-0/+38
2015-06-09index-pack: avoid excessive re-reading of pack directoryLibravatar Jeff King3-3/+14
2015-06-09commit: cope with scissors lines in commit messageLibravatar SZEDER Gábor2-5/+28
2015-06-09git-completion.tcsh: fix redirect with noclobberLibravatar Ariel Faigon1-1/+1
2015-06-08am --abort: keep unrelated commits on unborn branchLibravatar Paul Tan2-1/+12
2015-06-08am --abort: support aborting to unborn branchLibravatar Paul Tan2-1/+25
2015-06-08am --abort: revert changes introduced by failed 3way mergeLibravatar Paul Tan2-1/+28
2015-06-08am --skip: support skipping while on unborn branchLibravatar Paul Tan2-3/+11
2015-06-08am -3: support 3way merge on unborn branchLibravatar Paul Tan2-1/+11
2015-06-08am --skip: revert changes introduced by failed 3way mergeLibravatar Paul Tan2-1/+17
2015-06-08fsck: report errors if reflog entries point at invalid objectsLibravatar Michael Haggerty1-4/+9
2015-06-08fsck_handle_reflog_sha1(): new functionLibravatar Michael Haggerty1-14/+15
2015-06-08read_loose_refs(): treat NULL_SHA1 loose references as brokenLibravatar Michael Haggerty2-1/+11
2015-06-08read-cache: fix untracked cache invalidation when split-index is usedLibravatar Nguyễn Thái Ngọc Duy1-1/+2
2015-06-08git-p4: test with limited p4 server resultsLibravatar Luke Diamand1-6/+23
2015-06-08git-p4: additional testing of --changes-block-sizeLibravatar Luke Diamand1-9/+47
2015-06-08completion: teach 'scissors' mode to 'git commit --cleanup='Libravatar SZEDER Gábor1-1/+1
2015-06-05utf8: NO_ICONV: silence uninitialized variable warningLibravatar Eric Sunshine1-1/+3
2015-06-05lockfile: wait using sleep_millisec() instead of select()Libravatar Johannes Sixt1-9/+1
2015-06-05lockfile: convert retry timeout computations to millisecondLibravatar Johannes Sixt1-13/+8
2015-06-05help.c: wrap wait-only poll() invocation in sleep_millisec()Libravatar Johannes Sixt3-1/+7
2015-06-05lockfile: replace random() by rand()Libravatar Johannes Sixt1-2/+2
2015-06-05Sync with 2.4.3Libravatar Junio C Hamano2-1/+78
2015-06-05Git 2.4.3Libravatar Junio C Hamano4-3/+80
2015-06-05The first half of the seventh batch for 2.5Libravatar Junio C Hamano1-0/+14
2015-06-05Merge branch 'ld/p4-editor-multi-words'Libravatar Junio C Hamano5-7/+47
2015-06-05Merge branch 'bc/object-id'Libravatar Junio C Hamano36-255/+300
2015-06-05Merge branch 'jk/at-push-sha1'Libravatar Junio C Hamano14-149/+424
2015-06-05Merge branch 'dl/branch-error-message' into maintLibravatar Junio C Hamano1-3/+3
2015-06-05Merge branch 'jk/skip-http-tests-under-no-curl' into maintLibravatar Junio C Hamano8-35/+13
2015-06-05Merge branch 'ps/doc-packfile-vs-pack-file' into maintLibravatar Junio C Hamano3-9/+9
2015-06-05Merge branch 'fg/document-commit-message-stripping' into maintLibravatar Junio C Hamano1-4/+7
2015-06-05Merge branch 'jk/rerere-forget-check-enabled' into maintLibravatar Junio C Hamano1-0/+2
2015-06-05Merge branch 'pt/pull-log-n' into maintLibravatar Junio C Hamano2-2/+19
2015-06-05Merge branch 'pt/pull-ff-vs-merge-ff' into maintLibravatar Junio C Hamano3-2/+13
2015-06-05Merge branch 'rs/plug-leak-in-pack-bitmaps' into maintLibravatar Junio C Hamano1-5/+3
2015-06-05Merge branch 'ja/tutorial-asciidoctor-fix' into maintLibravatar Junio C Hamano1-1/+1