summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* userdiff: add support for Fountain documentszb/userdiff-fountainZoë Blade2015-07-234-0/+9
* Git 2.5.0-rc0v2.5.0-rc0Junio C Hamano2015-06-252-16/+3
* Merge branch 'cn/cvsimport-perl-update'Junio C Hamano2015-06-251-1/+1
|\
| * cvsimport: silence regex warning appearing in Perl 5.22.cn/cvsimport-perl-updateChristian Neukirchen2015-06-241-1/+1
* | Merge branch 'cb/array-size'Junio C Hamano2015-06-251-5/+3
|\ \
| * | Fix definition of ARRAY_SIZE for non-gcc buildscb/array-sizeCharles Bailey2015-06-241-5/+3
* | | Sync with 2.4.5Junio C Hamano2015-06-252-1/+30
|\ \ \
| * | | Git 2.4.5v2.4.5Junio C Hamano2015-06-254-3/+32
| * | | Merge branch 'sg/merge-summary-config' into maintJunio C Hamano2015-06-253-16/+12
| |\ \ \
| * \ \ \ Merge branch 'jk/make-fix-dependencies' into maintJunio C Hamano2015-06-251-24/+25
| |\ \ \ \
| * \ \ \ \ Merge branch 'sb/pack-protocol-mention-smart-http' into maintJunio C Hamano2015-06-251-3/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/die-on-bogus-worktree-late' into maintJunio C Hamano2015-06-252-10/+26
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'pt/pull-tags-error-diag' into maintJunio C Hamano2015-06-251-9/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/color-diff-plain-is-context' into maintJunio C Hamano2015-06-255-22/+23
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/diagnose-config-mmap-failure' into maintJunio C Hamano2015-06-254-11/+29
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maintJunio C Hamano2015-06-257-9/+34
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/rebase-i-post-rewrite-exec' into maintJunio C Hamano2015-06-252-41/+58
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/diff-i-t-a'Junio C Hamano2015-06-254-38/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Revert "diff-lib.c: adjust position of i-t-a entries in diff"nd/diff-i-t-aJunio C Hamano2015-06-234-38/+8
* | | | | | | | | | | | | | Ninth batch for 2.5Junio C Hamano2015-06-241-39/+102
* | | | | | | | | | | | | | Merge branch 'jk/stash-require-clean-index'Junio C Hamano2015-06-242-9/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Revert "stash: require a clean index to apply"jk/stash-require-clean-indexJeff King2015-06-152-9/+0
* | | | | | | | | | | | | | | Merge branch 'pa/auto-gc-mac-osx'Junio C Hamano2015-06-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | hooks/pre-auto-gc: adjust power checking for newer OS Xpa/auto-gc-mac-osxPanagiotis Astithas2015-06-121-1/+1
* | | | | | | | | | | | | | | | Merge branch 'pt/t0302-needs-sanity'Junio C Hamano2015-06-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | t0302: "unreadable" test needs SANITY prereqpt/t0302-needs-sanityPaul Tan2015-06-121-1/+1
* | | | | | | | | | | | | | | | | Merge branch 'ld/p4-changes-block-size'Junio C Hamano2015-06-243-31/+165
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | git-p4: fixing --changes-block-size handlingld/p4-changes-block-sizeLuke Diamand2015-06-102-28/+69
| * | | | | | | | | | | | | | | | | git-p4: add tests for non-numeric revision rangeLuke Diamand2015-06-101-0/+38
| * | | | | | | | | | | | | | | | | git-p4: test with limited p4 server resultsLuke Diamand2015-06-081-6/+23
| * | | | | | | | | | | | | | | | | git-p4: additional testing of --changes-block-sizeLuke Diamand2015-06-081-9/+47
* | | | | | | | | | | | | | | | | | Merge branch 'fk/doc-format-patch-vn'Junio C Hamano2015-06-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | doc: format-patch: fix typofk/doc-format-patch-vnFrans Klaver2015-06-101-1/+1
* | | | | | | | | | | | | | | | | | | Merge branch 'sg/commit-cleanup-scissors'Junio C Hamano2015-06-242-5/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | commit: cope with scissors lines in commit messagesg/commit-cleanup-scissorsSZEDER Gábor2015-06-092-5/+28
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/index-pack-reduce-recheck'Junio C Hamano2015-06-243-3/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | index-pack: avoid excessive re-reading of pack directoryjk/index-pack-reduce-recheckJeff King2015-06-093-3/+14
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch 'af/tcsh-completion-noclobber'Junio C Hamano2015-06-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | git-completion.tcsh: fix redirect with noclobberaf/tcsh-completion-noclobberAriel Faigon2015-06-091-1/+1
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch 'mh/reporting-broken-refs-from-for-each-ref'Junio C Hamano2015-06-243-7/+83
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | read_loose_refs(): treat NULL_SHA1 loose references as brokenmh/reporting-broken-refs-from-for-each-refMichael Haggerty2015-06-082-1/+11
| * | | | | | | | | | | | | | | | | | | read_loose_refs(): simplify function logicMichael Haggerty2015-06-031-7/+12
| * | | | | | | | | | | | | | | | | | | for-each-ref: report broken references correctlyMichael Haggerty2015-06-022-1/+6
| * | | | | | | | | | | | | | | | | | | t6301: new tests of for-each-ref error handlingMichael Haggerty2015-06-021-0/+56
* | | | | | | | | | | | | | | | | | | | Merge branch 'sg/completion-commit-cleanup'Junio C Hamano2015-06-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | completion: teach 'scissors' mode to 'git commit --cleanup='sg/completion-commit-cleanupSZEDER Gábor2015-06-081-1/+1
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'pt/am-abort-fix'Junio C Hamano2015-06-242-8/+104
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | am --abort: keep unrelated commits on unborn branchpt/am-abort-fixPaul Tan2015-06-082-1/+12
| * | | | | | | | | | | | | | | | | | | | am --abort: support aborting to unborn branchPaul Tan2015-06-082-1/+25
| * | | | | | | | | | | | | | | | | | | | am --abort: revert changes introduced by failed 3way mergePaul Tan2015-06-082-1/+28