summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* introduce "preciousObjects" repository extensionJeff King2015-06-258-9/+50
* introduce "extensions" form of core.repositoryformatversionJeff King2015-06-254-3/+159
* 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"Jeff 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 XPanagiotis Astithas2015-06-131-1/+1
* | | Merge branch 'pt/t0302-needs-sanity'Junio C Hamano2015-06-241-1/+1
|\ \ \
| * | | t0302: "unreadable" test needs SANITY prereqPaul 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 handlingLuke 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 typoFrans 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 messageSZEDER 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 directoryJeff King2015-06-093-3/+14
| |/ / / / / /
* | | | | | | Merge branch 'af/tcsh-completion-noclobber'Junio C Hamano2015-06-241-1/+1
|\ \ \ \ \ \ \
| * | | | | | | git-completion.tcsh: fix redirect with 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 brokenMichael 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='SZEDER 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 branchPaul 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
| * | | | | | | | am --skip: support skipping while on unborn branchPaul Tan2015-06-082-3/+11
| * | | | | | | | am -3: support 3way merge on unborn branchPaul Tan2015-06-082-1/+11
| * | | | | | | | am --skip: revert changes introduced by failed 3way mergePaul Tan2015-06-082-1/+17
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'nd/untracked-cache'Junio C Hamano2015-06-241-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | read-cache: fix untracked cache invalidation when split-index is usedNguyễn Thái Ngọc Duy2015-06-081-1/+2
* | | | | | | | | Merge branch 'mh/fsck-reflog-entries'Junio C Hamano2015-06-241-14/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fsck: report errors if reflog entries point at invalid objectsMichael Haggerty2015-06-081-4/+9
| * | | | | | | | | fsck_handle_reflog_sha1(): new functionMichael Haggerty2015-06-081-14/+15
* | | | | | | | | | Merge branch 'js/sleep-without-select'Junio C Hamano2015-06-244-23/+16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | lockfile: wait using sleep_millisec() instead of select()Johannes Sixt2015-06-061-9/+1
| * | | | | | | | | | lockfile: convert retry timeout computations to millisecondJohannes Sixt2015-06-061-13/+8
| * | | | | | | | | | help.c: wrap wait-only poll() invocation in sleep_millisec()Johannes Sixt2015-06-063-1/+7
| * | | | | | | | | | lockfile: replace random() by rand()Johannes Sixt2015-06-061-2/+2
* | | | | | | | | | | Merge branch 'es/utf8-stupid-compiler-workaround'Junio C Hamano2015-06-241-1/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | utf8: NO_ICONV: silence uninitialized variable warningEric Sunshine2015-06-061-1/+3
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'rl/am-3way-config'Junio C Hamano2015-06-244-17/+53
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-am: add am.threeWay config variableRemi Lespinet2015-06-044-2/+41