summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* cherry-pick/revert: add scissors line on merge conflictDenton Liu2019-04-197-14/+122
* sequencer.c: save and restore cleanup modePhillip Wood2019-04-191-1/+27
* merge: add scissors line on merge conflictDenton Liu2019-04-184-7/+82
* merge: cleanup messages like commitDenton Liu2019-04-187-13/+128
* parse-options.h: extract common --cleanup optionDenton Liu2019-04-183-3/+3
* commit: extract cleanup_mode functions to sequencerDenton Liu2019-04-183-23/+37
* t7502: clean up styleDenton Liu2019-04-181-40/+53
* t7604: clean up styleDenton Liu2019-04-181-5/+7
* t3507: clean up styleDenton Liu2019-04-181-21/+21
* t7600: clean up styleDenton Liu2019-04-181-14/+13
* sequencer: fix cleanup with --signoff and -xPhillip Wood2019-04-183-7/+38
* The fifth batchJunio C Hamano2019-04-161-0/+58
* Merge branch 'sg/t5318-cleanup'Junio C Hamano2019-04-161-1/+1
|\
| * t5318-commit-graph: remove unused variableSZEDER Gábor2019-03-241-1/+1
* | Merge branch 'jt/t5551-protocol-v2-does-not-have-half-auth'Junio C Hamano2019-04-161-1/+11
|\ \
| * | t5551: mark half-auth no-op fetch test as v0-onlyJonathan Tan2019-03-241-1/+11
| |/
* | Merge branch 'jk/http-walker-status-fix'Junio C Hamano2019-04-164-17/+47
|\ \
| * | http: use normalize_curl_result() instead of manual conversionJeff King2019-03-241-11/+2
| * | http: normalize curl results for dumb loose and alternates fetchesJeff King2019-03-242-0/+24
| * | http: factor out curl result code normalizationJeff King2019-03-242-6/+21
* | | Merge branch 'jh/midx-verify-too-many-packs'Junio C Hamano2019-04-166-9/+118
|\ \ \
| * | | midx: during verify group objects by packfile to speed verificationJeff Hostetler2019-03-223-4/+49
| * | | midx: add progress indicators in multi-pack-index verifyJeff Hostetler2019-03-221-2/+24
| * | | trace2:data: add trace2 data to midxJeff Hostetler2019-03-222-0/+7
| * | | progress: add sparse mode to force 100% complete messageJeff Hostetler2019-03-222-3/+38
| |/ /
* | | Merge branch 'bb/unicode-12'Junio C Hamano2019-04-161-13/+25
|\ \ \
| * | | unicode: update the width tables to Unicode 12Beat Bolli2019-03-221-13/+25
* | | | Merge branch 'jk/refs-double-abort'Junio C Hamano2019-04-162-1/+31
|\ \ \ \
| * | | | refs/files-backend: don't look at an aborted transactionJeff King2019-03-221-1/+5
| * | | | refs/files-backend: handle packed transaction prepare failureJeff King2019-03-222-0/+26
| | |_|/ | |/| |
* | | | Merge branch 'nd/checkout-m-doc-update'Junio C Hamano2019-04-162-0/+11
|\ \ \ \
| * | | | checkout.txt: note about losing staged changes with --mergeNguyễn Thái Ngọc Duy2019-03-212-0/+11
| |/ / /
* | | | Merge branch 'tb/trace2-va-list-fix'Junio C Hamano2019-04-165-9/+16
|\ \ \ \
| * | | | trace2: NULL is not allowed for va_listTorsten Bögershausen2019-03-205-9/+16
* | | | | Merge branch 'tz/completion'Junio C Hamano2019-04-164-13/+19
|\ \ \ \ \
| * | | | | completion: use __git when calling --list-cmdsTodd Zullinger2019-03-211-4/+4
| * | | | | completion: fix multiple command removalsJeff King2019-03-212-3/+3
| * | | | | t9902: test multiple removals via completion.commandsTodd Zullinger2019-03-211-0/+6
| * | | | | git: read local config in --list-cmdsJeff King2019-03-212-7/+7
* | | | | | Merge branch 'ma/doc-diff-doc-vs-doctor-comparison'Junio C Hamano2019-04-163-20/+90
|\ \ \ \ \ \
| * | | | | | doc-diff: add `--cut-header-footer`Martin Ågren2019-03-181-2/+17
| * | | | | | doc-diff: support diffing from/to AsciiDoc(tor)Martin Ågren2019-03-181-8/+45
| * | | | | | doc-diff: let `render_tree()` take an explicit directory nameMartin Ågren2019-03-181-11/+17
| * | | | | | Doc: auto-detect changed build flagsMartin Ågren2019-03-182-6/+18
| |/ / / / /
* | | | | | Merge branch 'tz/t4038-bash-redirect-target-workaround'Junio C Hamano2019-04-161-4/+4
|\ \ \ \ \ \
| * | | | | | t4038-diff-combined: quote paths with whitespaceTodd Zullinger2019-03-181-4/+4
| |/ / / / /
* | | | | | Merge branch 'ab/drop-scripted-rebase'Junio C Hamano2019-04-168-833/+35
|\ \ \ \ \ \
| * | | | | | rebase: remove the rebase.useBuiltin settingÆvar Arnfjörð Bjarmason2019-03-208-833/+35
| |/ / / / /
* | | | | | Merge branch 'jk/perf-lib-tee'Junio C Hamano2019-04-161-23/+11
|\ \ \ \ \ \
| * | | | | | perf-lib.sh: rely on test-lib.sh for --tee handlingJeff King2019-03-181-23/+11
| |/ / / / /