summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fsck (receive-pack): allow demoting errors to warningsJohannes Schindelin2015-06-235-2/+33
* fsck: offer a function to demote fsck errors to warningsJohannes Schindelin2015-06-232-5/+80
* fsck: provide a function to parse fsck message IDsJohannes Schindelin2015-06-221-2/+33
* fsck: introduce identifiers for fsck messagesJohannes Schindelin2015-06-223-78/+154
* fsck: introduce fsck optionsJohannes Schindelin2015-06-225-93/+114
* git-multimail: update to release 1.1.0Matthieu Moy2015-06-186-326/+1017
* Eighth batch for 2.5Junio C Hamano2015-06-161-1/+11
* Sync with 2.4.4Junio C Hamano2015-06-163-6/+42
|\
| * Git 2.4.4v2.4.4Junio C Hamano2015-06-164-3/+39
| * Merge branch 'jk/clone-dissociate' into maintJunio C Hamano2015-06-161-13/+4
| |\
| * \ Merge branch 'sb/submodule-doc-intro' into maintJunio C Hamano2015-06-161-28/+22
| |\ \
| * \ \ Merge branch 'sb/glossary-submodule' into maintJunio C Hamano2015-06-161-0/+16
| |\ \ \
| * \ \ \ Merge branch 'ah/usage-strings' into maintJunio C Hamano2015-06-162-2/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'mc/commit-doc-grammofix' into maintJunio C Hamano2015-06-161-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rs/janitorial' into maintJunio C Hamano2015-06-167-26/+9
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'sb/test-bitmap-free-at-end' into maintJunio C Hamano2015-06-161-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'dt/clean-pathspec-filter-then-lstat' into maintJunio C Hamano2015-06-161-3/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/http-backend-deadlock' into maintJunio C Hamano2015-06-163-29/+139
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jh/filter-empty-contents' into maintJunio C Hamano2015-06-162-1/+27
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/stash-options' into maintJunio C Hamano2015-06-162-1/+20
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/log-format-raw-doc' into maintJunio C Hamano2015-06-162-2/+14
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ep/do-not-feed-a-pointer-to-array-size' into maintJunio C Hamano2015-06-161-1/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'l10n-2.4-maint-de-updates' of git://github.com/git-l10n/git-po int...Junio C Hamano2015-06-141-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | l10n: de.po: translation fix for fall-back to 3way mergeMichael J Gruber2015-06-121-1/+1
| | * | | | | | | | | | | | | | l10n: de.po: punctuation fixesMichael J Gruber2015-06-121-2/+2
| | * | | | | | | | | | | | | | l10n: de.po: grammar fixMichael J Gruber2015-06-121-1/+1
| | * | | | | | | | | | | | | | l10n: de.po: change error message from "sagen" to "Meinten Sie"Phillip Sz2015-06-121-1/+1
* | | | | | | | | | | | | | | | Merge branch 'nd/slim-index-pack-memory-usage'Junio C Hamano2015-06-161-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | index-pack: fix truncation of off_t in comparisonnd/slim-index-pack-memory-usageJeff King2015-06-041-2/+6
* | | | | | | | | | | | | | | | | Merge branch 'sb/pack-protocol-mention-smart-http'Junio C Hamano2015-06-161-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Documentation/technical/pack-protocol: mention http as possible protocolsb/pack-protocol-mention-smart-httpStefan Beller2015-06-021-3/+3
* | | | | | | | | | | | | | | | | | Merge branch 'jk/make-fix-dependencies'Junio C Hamano2015-06-161-24/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Makefile: silence perl/PM.stamp recipejk/make-fix-dependenciesJeff King2015-05-291-1/+1
| * | | | | | | | | | | | | | | | | | Makefile: avoid timestamp updates to GIT-BUILD-OPTIONSJeff King2015-05-291-21/+22
| * | | | | | | | | | | | | | | | | | Makefile: drop dependency between git-instaweb and gitwebJeff King2015-05-291-1/+1
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'jk/die-on-bogus-worktree-late'Junio C Hamano2015-06-162-10/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | setup_git_directory: delay core.bare/core.worktree errorsjk/die-on-bogus-worktree-lateJeff King2015-05-292-10/+26
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'sg/merge-summary-config'Junio C Hamano2015-06-163-16/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Documentation: include 'merge.branchdesc' for merge and config as wellsg/merge-summary-configSZEDER Gábor2015-05-283-16/+12
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'ah/send-email-sendmail-alias'Junio C Hamano2015-06-163-2/+70
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | t9001: write $HOME/, not ~/, to help shells without tilde expansionah/send-email-sendmail-aliasJunio C Hamano2015-05-271-1/+1
| * | | | | | | | | | | | | | | | | | send-email: add sendmail email aliases formatAllen Hubbe2015-05-273-1/+69
* | | | | | | | | | | | | | | | | | | Second half of seventh batchJunio C Hamano2015-06-111-0/+28
* | | | | | | | | | | | | | | | | | | Merge branch 'tb/complete-sequencing'Junio C Hamano2015-06-111-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | completion: suggest sequencer commands for reverttb/complete-sequencingThomas Braun2015-06-011-0/+5
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/squelch-missing-link-warning-for-unreachable'Junio C Hamano2015-06-117-9/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | suppress errors on missing UNINTERESTING linksjk/squelch-missing-link-warning-for-unreachableJeff King2015-06-011-1/+1
| * | | | | | | | | | | | | | | | | | | | silence broken link warnings with revs->ignore_missing_linksJeff King2015-06-013-2/+17
| * | | | | | | | | | | | | | | | | | | | add quieter versions of parse_{tree,commit}Jeff King2015-06-014-6/+16
| | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'pt/pull-tests'Junio C Hamano2015-06-112-36/+175
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \