summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ds/close-object-store' into maintJunio C Hamano2019-07-2910-24/+28
|\
| * packfile: rename close_all_packs to close_object_storeDerrick Stolee2019-06-128-9/+9
| * commit-graph: collapse parameters into flagsDerrick Stolee2019-06-123-6/+8
| * commit-graph: return with errors during writeDerrick Stolee2019-06-123-15/+17
* | Merge branch 'rs/avoid-overflow-in-midpoint-computation' into maintJunio C Hamano2019-07-291-1/+1
|\ \
| * | cleanup: fix possible overflow errors in binary search, part 2René Scharfe2019-06-131-1/+1
* | | Merge branch 'jk/trailers-use-config' into maintJunio C Hamano2019-07-291-0/+3
|\ \ \
| * | | interpret-trailers: load default configJeff King2019-06-191-0/+3
* | | | Merge branch 'tg/stash-ref-by-index-fix' into maintJunio C Hamano2019-07-291-4/+5
|\ \ \ \
| * | | | stash: fix show referencing stash indexThomas Gummerer2019-06-191-4/+5
| | |/ / | |/| |
* | | | Merge branch 'pw/rebase-abort-clean-rewritten' into maintJunio C Hamano2019-07-291-10/+29
|\ \ \ \
| * | | | rebase --abort/--quit: cleanup refs/rewrittenPhillip Wood2019-05-151-9/+25
| * | | | rebase: warn if state directory cannot be removedPhillip Wood2019-05-151-3/+5
| * | | | rebase: fix a memory leakPhillip Wood2019-05-151-0/+1
* | | | | Merge branch 'jk/delta-islands-progress-fix' into maintJunio C Hamano2019-07-291-1/+1
|\ \ \ \ \
| * | | | | delta-islands: respect progress flagJeff King2019-06-201-1/+1
* | | | | | Merge branch 'ms/submodule-foreach-fix' into maintJunio C Hamano2019-07-291-0/+1
|\ \ \ \ \ \
| * | | | | | submodule foreach: fix recursion of optionsMorian Sonnet2019-06-251-0/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'js/rebase-reschedule-applies-only-to-interactive' into maintJunio C Hamano2019-07-291-3/+7
|\ \ \ \ \ \
| * | | | | | rebase --am: ignore rebase.rescheduleFailedExecJohannes Schindelin2019-07-011-3/+7
* | | | | | | Merge branch 'jc/denoise-rm-to-resolve' into maintJunio C Hamano2019-07-291-1/+1
|\ \ \ \ \ \ \
| * | | | | | | rm: resolving by removal is not a warning-worthy eventJunio C Hamano2019-07-181-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'js/clean-report-too-long-a-path' into maintJunio C Hamano2019-07-291-1/+2
|\ \ \ \ \ \ \
| * | | | | | | clean: show an error message when the path is too longJohannes Schindelin2019-07-191-1/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'po/doc-branch' into maintJunio C Hamano2019-07-291-1/+2
|\ \ \ \ \ \ \
| * | | | | | | doc branch: provide examples for listing remote tracking branchesPhilip Oakley2019-05-291-1/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'js/bisect-helper-check-get-oid-return-value' into maintJunio C Hamano2019-07-251-1/+4
|\ \ \ \ \ \ \
| * | | | | | | bisect--helper: verify HEAD could be parsed before continuingJohannes Schindelin2019-05-281-1/+4
| |/ / / / / /
* | | | | | | Merge branch 'jt/partial-clone-missing-ref-delta-base' into maintJunio C Hamano2019-07-251-2/+24
|\ \ \ \ \ \ \
| * | | | | | | index-pack: prefetch missing REF_DELTA basesJonathan Tan2019-05-151-2/+24
* | | | | | | | Merge branch 'xl/record-partial-clone-origin' into maintJunio C Hamano2019-07-251-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | clone: respect user supplied origin name when setting up partial cloneXin Li2019-05-291-1/+1
* | | | | | | | | Merge branch 'js/fsmonitor-unflake' into maintJunio C Hamano2019-07-251-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fill_stat_cache_info(): prepare for an fsmonitor fixJohannes Schindelin2019-05-281-1/+1
* | | | | | | | | | Merge branch 'vv/merge-squash-with-explicit-commit' into maintJunio C Hamano2019-07-251-1/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | merge: refuse --commit with --squashVishal Verma2019-05-281-1/+11
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/am-i-resolved-fix' into maintJunio C Hamano2019-07-251-11/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | am: fix --interactive HEAD tree resolutionJeff King2019-05-281-3/+4
| * | | | | | | | | | am: drop tty requirement for --interactiveJeff King2019-05-281-3/+3
| * | | | | | | | | | am: read interactive input from stdinJeff King2019-05-281-2/+4
| * | | | | | | | | | am: simplify prompt response handlingJeff King2019-05-281-3/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'nd/init-relative-template-fix' into maintJunio C Hamano2019-07-251-0/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | init: make --template path relative to $CWDNguyễn Thái Ngọc Duy2019-05-131-0/+3
| |/ / / / / / / /
* | | | | | | | | Merge branch 'js/rebase-config-bitfix'Junio C Hamano2019-05-301-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | rebase: replace incorrect logical negation by correct bitwise oneJohannes Schindelin2019-05-281-1/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'js/difftool-no-index'Junio C Hamano2019-05-191-1/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | difftool --no-index: error out on --dir-diff (and don't crash)Johannes Schindelin2019-05-091-1/+2
* | | | | | | | Merge branch 'ds/midx-too-many-packs'Junio C Hamano2019-05-192-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | midx: pass a repository pointerDerrick Stolee2019-05-072-2/+2
* | | | | | | | | Merge branch 'en/unicode-in-refnames'Junio C Hamano2019-05-192-0/+5
|\ \ \ \ \ \ \ \ \