summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2015-06-25Git 2.5.0-rc0v2.5.0-rc0Junio C Hamano2-16/+3
2015-06-25Merge branch 'cn/cvsimport-perl-update'Junio C Hamano1-1/+1
2015-06-25Merge branch 'cb/array-size'Junio C Hamano1-5/+3
2015-06-25Sync with 2.4.5Junio C Hamano2-1/+30
2015-06-25Git 2.4.5v2.4.5Junio C Hamano4-3/+32
2015-06-25Merge branch 'sg/merge-summary-config' into maintJunio C Hamano3-16/+12
2015-06-25Merge branch 'jk/make-fix-dependencies' into maintJunio C Hamano1-24/+25
2015-06-25Merge branch 'sb/pack-protocol-mention-smart-http' into maintJunio C Hamano1-3/+3
2015-06-25Merge branch 'jk/die-on-bogus-worktree-late' into maintJunio C Hamano2-10/+26
2015-06-25Merge branch 'pt/pull-tags-error-diag' into maintJunio C Hamano1-9/+0
2015-06-25Merge branch 'jk/color-diff-plain-is-context' into maintJunio C Hamano5-22/+23
2015-06-25Merge branch 'jk/diagnose-config-mmap-failure' into maintJunio C Hamano4-11/+29
2015-06-25Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maintJunio C Hamano7-9/+34
2015-06-25Merge branch 'mm/rebase-i-post-rewrite-exec' into maintJunio C Hamano2-41/+58
2015-06-25Merge branch 'nd/diff-i-t-a'Junio C Hamano4-38/+8
2015-06-24cvsimport: silence regex warning appearing in Perl 5.22.Christian Neukirchen1-1/+1
2015-06-24Fix definition of ARRAY_SIZE for non-gcc buildsCharles Bailey1-5/+3
2015-06-24Ninth batch for 2.5Junio C Hamano1-39/+102
2015-06-24Merge branch 'jk/stash-require-clean-index'Junio C Hamano2-9/+0
2015-06-24Merge branch 'pa/auto-gc-mac-osx'Junio C Hamano1-1/+1
2015-06-24Merge branch 'pt/t0302-needs-sanity'Junio C Hamano1-1/+1
2015-06-24Merge branch 'ld/p4-changes-block-size'Junio C Hamano3-31/+165
2015-06-24Merge branch 'fk/doc-format-patch-vn'Junio C Hamano1-1/+1
2015-06-24Merge branch 'sg/commit-cleanup-scissors'Junio C Hamano2-5/+28
2015-06-24Merge branch 'jk/index-pack-reduce-recheck'Junio C Hamano3-3/+14
2015-06-24Merge branch 'af/tcsh-completion-noclobber'Junio C Hamano1-1/+1
2015-06-24Merge branch 'mh/reporting-broken-refs-from-for-each-ref'Junio C Hamano3-7/+83
2015-06-24Merge branch 'sg/completion-commit-cleanup'Junio C Hamano1-1/+1
2015-06-24Merge branch 'pt/am-abort-fix'Junio C Hamano2-8/+104
2015-06-24Merge branch 'nd/untracked-cache'Junio C Hamano1-1/+2
2015-06-24Merge branch 'mh/fsck-reflog-entries'Junio C Hamano1-14/+20
2015-06-24Merge branch 'js/sleep-without-select'Junio C Hamano4-23/+16
2015-06-24Merge branch 'es/utf8-stupid-compiler-workaround'Junio C Hamano1-1/+3
2015-06-24Merge branch 'rl/am-3way-config'Junio C Hamano4-17/+53
2015-06-24Merge branch 'jc/ll-merge-expose-path'Junio C Hamano3-8/+21
2015-06-24Merge branch 'es/osx-header-pollutes-mask-macro'Junio C Hamano4-29/+29
2015-06-24Merge branch 'es/configure-getdelim'Junio C Hamano2-0/+9
2015-06-24Merge branch 'pt/pull-optparse'Junio C Hamano4-43/+122
2015-06-24Merge branch 'qn/blame-show-email'Junio C Hamano3-1/+73
2015-06-24Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks'Junio C Hamano2-6/+14
2015-06-24Merge branch 'es/send-email-sendmail-alias'Junio C Hamano3-46/+98
2015-06-24Merge branch 'jc/apply-reject-noop-hunk'Junio C Hamano2-0/+16
2015-06-23Revert "diff-lib.c: adjust position of i-t-a entries in diff"Junio C Hamano4-38/+8
2015-06-18git-multimail: update to release 1.1.0Matthieu Moy6-326/+1017
2015-06-16Eighth batch for 2.5Junio C Hamano1-1/+11
2015-06-16Sync with 2.4.4Junio C Hamano3-6/+42
2015-06-16Git 2.4.4v2.4.4Junio C Hamano4-3/+39
2015-06-16Merge branch 'jk/clone-dissociate' into maintJunio C Hamano1-13/+4
2015-06-16Merge branch 'sb/submodule-doc-intro' into maintJunio C Hamano1-28/+22
2015-06-16Merge branch 'sb/glossary-submodule' into maintJunio C Hamano1-0/+16
2015-06-16Merge branch 'ah/usage-strings' into maintJunio C Hamano2-2/+2
2015-06-16Merge branch 'mc/commit-doc-grammofix' into maintJunio C Hamano1-1/+1
2015-06-16Merge branch 'rs/janitorial' into maintJunio C Hamano7-26/+9
2015-06-16Merge branch 'sb/test-bitmap-free-at-end' into maintJunio C Hamano1-1/+1
2015-06-16Merge branch 'dt/clean-pathspec-filter-then-lstat' into maintJunio C Hamano1-3/+3
2015-06-16Merge branch 'jk/http-backend-deadlock' into maintJunio C Hamano3-29/+139
2015-06-16Merge branch 'jh/filter-empty-contents' into maintJunio C Hamano2-1/+27
2015-06-16Merge branch 'jk/stash-options' into maintJunio C Hamano2-1/+20
2015-06-16Merge branch 'mm/log-format-raw-doc' into maintJunio C Hamano2-2/+14
2015-06-16Merge branch 'ep/do-not-feed-a-pointer-to-array-size' into maintJunio C Hamano1-1/+53
2015-06-16Merge branch 'nd/slim-index-pack-memory-usage'Junio C Hamano1-2/+6
2015-06-16Merge branch 'sb/pack-protocol-mention-smart-http'Junio C Hamano1-3/+3
2015-06-16Merge branch 'jk/make-fix-dependencies'Junio C Hamano1-24/+25
2015-06-16Merge branch 'jk/die-on-bogus-worktree-late'Junio C Hamano2-10/+26
2015-06-16Merge branch 'sg/merge-summary-config'Junio C Hamano3-16/+12
2015-06-16Merge branch 'ah/send-email-sendmail-alias'Junio C Hamano3-2/+70
2015-06-15Revert "stash: require a clean index to apply"Jeff King2-9/+0
2015-06-14Merge tag 'l10n-2.4-maint-de-updates' of git://github.com/git-l10n/git-po int...Junio C Hamano1-5/+5
2015-06-12hooks/pre-auto-gc: adjust power checking for newer OS XPanagiotis Astithas1-1/+1
2015-06-12t0302: "unreadable" test needs SANITY prereqPaul Tan1-1/+1
2015-06-12l10n: de.po: translation fix for fall-back to 3way mergeMichael J Gruber1-1/+1
2015-06-12l10n: de.po: punctuation fixesMichael J Gruber1-2/+2
2015-06-12l10n: de.po: grammar fixMichael J Gruber1-1/+1
2015-06-12l10n: de.po: change error message from "sagen" to "Meinten Sie"Phillip Sz1-1/+1
2015-06-11Second half of seventh batchJunio C Hamano1-0/+28
2015-06-11Merge branch 'tb/complete-sequencing'Junio C Hamano1-0/+5
2015-06-11Merge branch 'jk/squelch-missing-link-warning-for-unreachable'Junio C Hamano7-9/+34
2015-06-11Merge branch 'pt/pull-tests'Junio C Hamano2-36/+175
2015-06-11Merge branch 'sb/glossary-submodule'Junio C Hamano1-0/+16
2015-06-11Merge branch 'sb/submodule-doc-intro'Junio C Hamano1-28/+22
2015-06-11Merge branch 'jk/diagnose-config-mmap-failure'Junio C Hamano4-11/+29
2015-06-11Merge branch 'mt/p4-depotFile-at-version'Junio C Hamano1-1/+1
2015-06-11Merge branch 'mh/verify-lock-error-report'Junio C Hamano2-21/+33
2015-06-11Merge branch 'jk/color-diff-plain-is-context'Junio C Hamano5-23/+24
2015-06-11Merge branch 'jk/clone-dissociate'Junio C Hamano1-13/+4
2015-06-11Merge branch 'jc/diff-ws-error-highlight'Junio C Hamano4-260/+385
2015-06-10doc: format-patch: fix typoFrans Klaver1-1/+1
2015-06-10git-p4: fixing --changes-block-size handlingLuke Diamand2-28/+69
2015-06-10git-p4: add tests for non-numeric revision rangeLuke Diamand1-0/+38
2015-06-09index-pack: avoid excessive re-reading of pack directoryJeff King3-3/+14
2015-06-09commit: cope with scissors lines in commit messageSZEDER Gábor2-5/+28
2015-06-09git-completion.tcsh: fix redirect with noclobberAriel Faigon1-1/+1
2015-06-08am --abort: keep unrelated commits on unborn branchPaul Tan2-1/+12
2015-06-08am --abort: support aborting to unborn branchPaul Tan2-1/+25
2015-06-08am --abort: revert changes introduced by failed 3way mergePaul Tan2-1/+28
2015-06-08am --skip: support skipping while on unborn branchPaul Tan2-3/+11
2015-06-08am -3: support 3way merge on unborn branchPaul Tan2-1/+11
2015-06-08am --skip: revert changes introduced by failed 3way mergePaul Tan2-1/+17
2015-06-08fsck: report errors if reflog entries point at invalid objectsMichael Haggerty1-4/+9
2015-06-08fsck_handle_reflog_sha1(): new functionMichael Haggerty1-14/+15
2015-06-08read_loose_refs(): treat NULL_SHA1 loose references as brokenMichael Haggerty2-1/+11
2015-06-08read-cache: fix untracked cache invalidation when split-index is usedNguyễn Thái Ngọc Duy1-1/+2
2015-06-08git-p4: test with limited p4 server resultsLuke Diamand1-6/+23
2015-06-08git-p4: additional testing of --changes-block-sizeLuke Diamand1-9/+47
2015-06-08completion: teach 'scissors' mode to 'git commit --cleanup='SZEDER Gábor1-1/+1
2015-06-05utf8: NO_ICONV: silence uninitialized variable warningEric Sunshine1-1/+3
2015-06-05lockfile: wait using sleep_millisec() instead of select()Johannes Sixt1-9/+1
2015-06-05lockfile: convert retry timeout computations to millisecondJohannes Sixt1-13/+8
2015-06-05help.c: wrap wait-only poll() invocation in sleep_millisec()Johannes Sixt3-1/+7
2015-06-05lockfile: replace random() by rand()Johannes Sixt1-2/+2
2015-06-05Sync with 2.4.3Junio C Hamano2-1/+78
2015-06-05Git 2.4.3v2.4.3Junio C Hamano4-3/+80
2015-06-05The first half of the seventh batch for 2.5Junio C Hamano1-0/+14
2015-06-05Merge branch 'ld/p4-editor-multi-words'Junio C Hamano5-7/+47
2015-06-05Merge branch 'bc/object-id'Junio C Hamano36-255/+300
2015-06-05Merge branch 'jk/at-push-sha1'Junio C Hamano14-149/+424
2015-06-05Merge branch 'dl/branch-error-message' into maintJunio C Hamano1-3/+3
2015-06-05Merge branch 'jk/skip-http-tests-under-no-curl' into maintJunio C Hamano8-35/+13
2015-06-05Merge branch 'ps/doc-packfile-vs-pack-file' into maintJunio C Hamano3-9/+9
2015-06-05Merge branch 'fg/document-commit-message-stripping' into maintJunio C Hamano1-4/+7
2015-06-05Merge branch 'jk/rerere-forget-check-enabled' into maintJunio C Hamano1-0/+2
2015-06-05Merge branch 'pt/pull-log-n' into maintJunio C Hamano2-2/+19
2015-06-05Merge branch 'pt/pull-ff-vs-merge-ff' into maintJunio C Hamano3-2/+13
2015-06-05Merge branch 'rs/plug-leak-in-pack-bitmaps' into maintJunio C Hamano1-5/+3
2015-06-05Merge branch 'ja/tutorial-asciidoctor-fix' into maintJunio C Hamano1-1/+1
2015-06-05Merge branch 'jk/stripspace-asciidoctor-fix' into maintJunio C Hamano1-3/+3
2015-06-05Merge branch 'jk/asciidoc-markup-fix' into maintJunio C Hamano19-102/+107
2015-06-05Merge branch 'ps/bundle-verify-arg' into maintJunio C Hamano1-0/+8
2015-06-05Merge branch 'mh/write-refs-sooner-2.4' into maintJunio C Hamano3-33/+112
2015-06-05Merge branch 'mh/ref-directory-file' into maintJunio C Hamano3-118/+312
2015-06-05Merge branch 'mg/log-decorate-HEAD' into maintJunio C Hamano2-11/+22
2015-06-05Merge branch 'sb/t1020-cleanup' into maintJunio C Hamano1-4/+7
2015-06-05Merge branch 'jc/gitignore-precedence' into maintJunio C Hamano2-3/+17
2015-06-05Merge branch 'bc/connect-plink' into maintJunio C Hamano2-22/+67
2015-06-05Merge branch 'ph/rebase-i-redo' into maintJunio C Hamano2-0/+63
2015-06-05Merge branch 'jk/add-e-kill-editor' into maintJunio C Hamano2-1/+9
2015-06-05Merge branch 'mh/clone-verbosity-fix' into maintJunio C Hamano1-2/+2
2015-06-05Merge branch 'jk/sha1-file-reduce-useless-warnings' into maintJunio C Hamano2-6/+2
2015-06-05Merge branch 'tb/blame-resurrect-convert-to-git' into maintJunio C Hamano2-3/+16
2015-06-05Merge branch 'jc/plug-fmt-merge-msg-leak' into maintJunio C Hamano1-5/+11
2015-06-05Merge branch 'pt/xdg-config-path' into maintJunio C Hamano10-81/+243
2015-06-04ll-merge: pass the original path to external driversJunio C Hamano3-8/+21
2015-06-04git-am: add am.threeWay config variableRemi Lespinet4-2/+41
2015-06-04t4150-am: refactor am -3 testsRemi Lespinet1-15/+11
2015-06-04git-am.sh: fix initialization of the threeway variableRemi Lespinet1-0/+1
2015-06-04index-pack: fix truncation of off_t in comparisonJeff King1-2/+6
2015-06-03read_loose_refs(): simplify function logicMichael Haggerty1-7/+12
2015-06-03configure: add getdelim() checkEric Sunshine1-0/+6
2015-06-03config.mak.uname: Darwin: define HAVE_GETDELIM for modern OS X releasesEric Sunshine1-0/+3
2015-06-03ewah: use less generic macro nameJeff King4-23/+23
2015-06-03ewah/bitmap: silence warning about MASK macro redefinitionEric Sunshine1-8/+8
2015-06-02Documentation/technical/pack-protocol: mention http as possible protocolStefan Beller1-3/+3
2015-06-02pull: use git-rev-parse --parseopt for option parsingPaul Tan1-40/+57
2015-06-02pull: handle git-fetch's options as wellPaul Tan4-6/+68
2015-06-02Merge branch 'pt/pull-tests' into pt/pull-optparseJunio C Hamano2-36/+175
2015-06-02for-each-ref: report broken references correctlyMichael Haggerty2-1/+6
2015-06-02t6301: new tests of for-each-ref error handlingMichael Haggerty1-0/+56
2015-06-01format-patch: do not feed tags to clear_commit_marks()Junio C Hamano2-6/+14
2015-06-01send-email: further warn about unsupported sendmail aliases featuresEric Sunshine1-0/+4
2015-06-01t9001: add sendmail aliases line continuation testsEric Sunshine1-0/+34
2015-06-01t9001: refactor sendmail aliases test infrastructureEric Sunshine1-18/+29
2015-06-01send-email: implement sendmail aliases line continuation supportEric Sunshine2-5/+7
2015-06-01send-email: simplify sendmail aliases comment and blank line recognizerEric Sunshine1-1/+1
2015-06-01send-email: refactor sendmail aliases parserEric Sunshine1-14/+24
2015-06-01send-email: fix style: cuddle 'elsif' and 'else' with closing braceEric Sunshine1-12/+5
2015-06-01send-email: drop noise comments which merely repeat what code saysEric Sunshine1-5/+0
2015-06-01send-email: visually distinguish sendmail aliases parser warningsEric Sunshine1-3/+3
2015-06-01send-email: further document missing sendmail aliases functionalityEric Sunshine1-0/+3
2015-06-01blame: add blame.showEmail configurationQuentin Neill3-1/+73
2015-06-01Sixth batch for 2.5 cycleJunio C Hamano1-1/+50
2015-06-01Merge branch 'sb/test-bitmap-free-at-end'Junio C Hamano1-1/+1
2015-06-01Merge branch 'mm/rebase-i-post-rewrite-exec'Junio C Hamano2-41/+58
2015-06-01Merge branch 'fm/fetch-raw-sha1'Junio C Hamano6-16/+116
2015-06-01Merge branch 'sg/help-group'Junio C Hamano7-51/+117
2015-06-01Merge branch 'mm/log-format-raw-doc'Junio C Hamano2-2/+14
2015-06-01Merge branch 'dt/cat-file-follow-symlinks'Junio C Hamano7-19/+601
2015-06-01Merge branch 'rs/janitorial'Junio C Hamano7-26/+9
2015-06-01Merge branch 'jk/stash-options'Junio C Hamano2-1/+20
2015-06-01Merge branch 'da/mergetool-winmerge'Junio C Hamano3-2/+39
2015-06-01Merge branch 'mc/commit-doc-grammofix'Junio C Hamano1-1/+1
2015-06-01Merge branch 'jh/filter-empty-contents'Junio C Hamano2-1/+27
2015-06-01Merge branch 'ah/usage-strings'Junio C Hamano2-2/+2
2015-06-01Merge branch 'jk/http-backend-deadlock'Junio C Hamano3-29/+139
2015-06-01Merge branch 'dt/clean-pathspec-filter-then-lstat'Junio C Hamano1-3/+3
2015-06-01apply: reject a hunk that does not do anythingJunio C Hamano2-0/+16
2015-06-01suppress errors on missing UNINTERESTING linksJeff King1-1/+1
2015-06-01silence broken link warnings with revs->ignore_missing_linksJeff King3-2/+17
2015-06-01add quieter versions of parse_{tree,commit}Jeff King4-6/+16
2015-06-01completion: suggest sequencer commands for revertThomas Braun1-0/+5
2015-05-29glossary: add "remote", "submodule", "superproject"Stefan Beller1-0/+16
2015-05-29setup_git_directory: delay core.bare/core.worktree errorsJeff King2-10/+26
2015-05-29Makefile: silence perl/PM.stamp recipeJeff King1-1/+1
2015-05-29Makefile: avoid timestamp updates to GIT-BUILD-OPTIONSJeff King1-21/+22
2015-05-29Makefile: drop dependency between git-instaweb and gitwebJeff King1-1/+1
2015-05-29t5520: check reflog action in fast-forward mergePaul Tan1-3/+10
2015-05-29t5521: test --dry-run does not make any changesPaul Tan1-0/+13
2015-05-29t5520: test --rebase failure on unborn branch with indexPaul Tan1-0/+15
2015-05-29t5520: test --rebase with multiple branchesPaul Tan1-0/+9
2015-05-29t5520: test work tree fast-forward when fetch updates headPaul Tan1-0/+21
2015-05-29t5520: test for failure if index has unresolved entriesPaul Tan1-0/+19