aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* userdiff: add support for Fountain documentsZoë Blade2015-07-23
* Git 2.5.0-rc0v2.5.0-rc0Junio C Hamano2015-06-25
* Merge branch 'cn/cvsimport-perl-update'Junio C Hamano2015-06-25
|\
| * cvsimport: silence regex warning appearing in Perl 5.22.Christian Neukirchen2015-06-24
* | Merge branch 'cb/array-size'Junio C Hamano2015-06-25
|\ \
| * | Fix definition of ARRAY_SIZE for non-gcc buildsCharles Bailey2015-06-24
* | | Sync with 2.4.5Junio C Hamano2015-06-25
|\ \ \
| * | | Git 2.4.5v2.4.5Junio C Hamano2015-06-25
| * | | Merge branch 'sg/merge-summary-config' into maintJunio C Hamano2015-06-25
| |\ \ \
| * \ \ \ Merge branch 'jk/make-fix-dependencies' into maintJunio C Hamano2015-06-25
| |\ \ \ \
| * \ \ \ \ Merge branch 'sb/pack-protocol-mention-smart-http' into maintJunio C Hamano2015-06-25
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/die-on-bogus-worktree-late' into maintJunio C Hamano2015-06-25
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'pt/pull-tags-error-diag' into maintJunio C Hamano2015-06-25
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/color-diff-plain-is-context' into maintJunio C Hamano2015-06-25
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/diagnose-config-mmap-failure' into maintJunio C Hamano2015-06-25
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maintJunio C Hamano2015-06-25
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/rebase-i-post-rewrite-exec' into maintJunio C Hamano2015-06-25
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/diff-i-t-a'Junio C Hamano2015-06-25
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Revert "diff-lib.c: adjust position of i-t-a entries in diff"Junio C Hamano2015-06-23
* | | | | | | | | | | | | | Ninth batch for 2.5Junio C Hamano2015-06-24
* | | | | | | | | | | | | | Merge branch 'jk/stash-require-clean-index'Junio C Hamano2015-06-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Revert "stash: require a clean index to apply"Jeff King2015-06-15
* | | | | | | | | | | | | | | Merge branch 'pa/auto-gc-mac-osx'Junio C Hamano2015-06-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | hooks/pre-auto-gc: adjust power checking for newer OS XPanagiotis Astithas2015-06-12
* | | | | | | | | | | | | | | | Merge branch 'pt/t0302-needs-sanity'Junio C Hamano2015-06-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | t0302: "unreadable" test needs SANITY prereqPaul Tan2015-06-12
* | | | | | | | | | | | | | | | | Merge branch 'ld/p4-changes-block-size'Junio C Hamano2015-06-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | git-p4: fixing --changes-block-size handlingLuke Diamand2015-06-10
| * | | | | | | | | | | | | | | | | git-p4: add tests for non-numeric revision rangeLuke Diamand2015-06-10
| * | | | | | | | | | | | | | | | | git-p4: test with limited p4 server resultsLuke Diamand2015-06-08
| * | | | | | | | | | | | | | | | | git-p4: additional testing of --changes-block-sizeLuke Diamand2015-06-08
* | | | | | | | | | | | | | | | | | Merge branch 'fk/doc-format-patch-vn'Junio C Hamano2015-06-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | doc: format-patch: fix typoFrans Klaver2015-06-10
* | | | | | | | | | | | | | | | | | | Merge branch 'sg/commit-cleanup-scissors'Junio C Hamano2015-06-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | commit: cope with scissors lines in commit messageSZEDER Gábor2015-06-09
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/index-pack-reduce-recheck'Junio C Hamano2015-06-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | index-pack: avoid excessive re-reading of pack directoryJeff King2015-06-09
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch 'af/tcsh-completion-noclobber'Junio C Hamano2015-06-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | git-completion.tcsh: fix redirect with noclobberAriel Faigon2015-06-09
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch 'mh/reporting-broken-refs-from-for-each-ref'Junio C Hamano2015-06-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | read_loose_refs(): treat NULL_SHA1 loose references as brokenMichael Haggerty2015-06-08
| * | | | | | | | | | | | | | | | | | | read_loose_refs(): simplify function logicMichael Haggerty2015-06-03
| * | | | | | | | | | | | | | | | | | | for-each-ref: report broken references correctlyMichael Haggerty2015-06-02
| * | | | | | | | | | | | | | | | | | | t6301: new tests of for-each-ref error handlingMichael Haggerty2015-06-02
* | | | | | | | | | | | | | | | | | | | Merge branch 'sg/completion-commit-cleanup'Junio C Hamano2015-06-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | completion: teach 'scissors' mode to 'git commit --cleanup='SZEDER Gábor2015-06-08
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'pt/am-abort-fix'Junio C Hamano2015-06-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | am --abort: keep unrelated commits on unborn branchPaul Tan2015-06-08
| * | | | | | | | | | | | | | | | | | | | am --abort: support aborting to unborn branchPaul Tan2015-06-08
| * | | | | | | | | | | | | | | | | | | | am --abort: revert changes introduced by failed 3way mergePaul Tan2015-06-08