Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ds/close-object-store' into maint | Junio C Hamano | 2019-07-29 | 10 | -24/+28 |
|\ | |||||
| * | packfile: rename close_all_packs to close_object_store | Derrick Stolee | 2019-06-12 | 8 | -9/+9 |
| * | commit-graph: collapse parameters into flags | Derrick Stolee | 2019-06-12 | 3 | -6/+8 |
| * | commit-graph: return with errors during write | Derrick Stolee | 2019-06-12 | 3 | -15/+17 |
* | | Merge branch 'rs/avoid-overflow-in-midpoint-computation' into maint | Junio C Hamano | 2019-07-29 | 1 | -1/+1 |
|\ \ | |||||
| * | | cleanup: fix possible overflow errors in binary search, part 2 | René Scharfe | 2019-06-13 | 1 | -1/+1 |
* | | | Merge branch 'jk/trailers-use-config' into maint | Junio C Hamano | 2019-07-29 | 1 | -0/+3 |
|\ \ \ | |||||
| * | | | interpret-trailers: load default config | Jeff King | 2019-06-19 | 1 | -0/+3 |
* | | | | Merge branch 'tg/stash-ref-by-index-fix' into maint | Junio C Hamano | 2019-07-29 | 1 | -4/+5 |
|\ \ \ \ | |||||
| * | | | | stash: fix show referencing stash index | Thomas Gummerer | 2019-06-19 | 1 | -4/+5 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'pw/rebase-abort-clean-rewritten' into maint | Junio C Hamano | 2019-07-29 | 1 | -10/+29 |
|\ \ \ \ | |||||
| * | | | | rebase --abort/--quit: cleanup refs/rewritten | Phillip Wood | 2019-05-15 | 1 | -9/+25 |
| * | | | | rebase: warn if state directory cannot be removed | Phillip Wood | 2019-05-15 | 1 | -3/+5 |
| * | | | | rebase: fix a memory leak | Phillip Wood | 2019-05-15 | 1 | -0/+1 |
* | | | | | Merge branch 'jk/delta-islands-progress-fix' into maint | Junio C Hamano | 2019-07-29 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | delta-islands: respect progress flag | Jeff King | 2019-06-20 | 1 | -1/+1 |
* | | | | | | Merge branch 'ms/submodule-foreach-fix' into maint | Junio C Hamano | 2019-07-29 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | submodule foreach: fix recursion of options | Morian Sonnet | 2019-06-25 | 1 | -0/+1 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'js/rebase-reschedule-applies-only-to-interactive' into maint | Junio C Hamano | 2019-07-29 | 1 | -3/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | rebase --am: ignore rebase.rescheduleFailedExec | Johannes Schindelin | 2019-07-01 | 1 | -3/+7 |
* | | | | | | | Merge branch 'jc/denoise-rm-to-resolve' into maint | Junio C Hamano | 2019-07-29 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rm: resolving by removal is not a warning-worthy event | Junio C Hamano | 2019-07-18 | 1 | -1/+1 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'js/clean-report-too-long-a-path' into maint | Junio C Hamano | 2019-07-29 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | clean: show an error message when the path is too long | Johannes Schindelin | 2019-07-19 | 1 | -1/+2 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'po/doc-branch' into maint | Junio C Hamano | 2019-07-29 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | doc branch: provide examples for listing remote tracking branches | Philip Oakley | 2019-05-29 | 1 | -1/+2 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'js/bisect-helper-check-get-oid-return-value' into maint | Junio C Hamano | 2019-07-25 | 1 | -1/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | bisect--helper: verify HEAD could be parsed before continuing | Johannes Schindelin | 2019-05-28 | 1 | -1/+4 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'jt/partial-clone-missing-ref-delta-base' into maint | Junio C Hamano | 2019-07-25 | 1 | -2/+24 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | index-pack: prefetch missing REF_DELTA bases | Jonathan Tan | 2019-05-15 | 1 | -2/+24 |
* | | | | | | | | Merge branch 'xl/record-partial-clone-origin' into maint | Junio C Hamano | 2019-07-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | clone: respect user supplied origin name when setting up partial clone | Xin Li | 2019-05-29 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'js/fsmonitor-unflake' into maint | Junio C Hamano | 2019-07-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fill_stat_cache_info(): prepare for an fsmonitor fix | Johannes Schindelin | 2019-05-28 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'vv/merge-squash-with-explicit-commit' into maint | Junio C Hamano | 2019-07-25 | 1 | -1/+11 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | merge: refuse --commit with --squash | Vishal Verma | 2019-05-28 | 1 | -1/+11 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jk/am-i-resolved-fix' into maint | Junio C Hamano | 2019-07-25 | 1 | -11/+12 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | am: fix --interactive HEAD tree resolution | Jeff King | 2019-05-28 | 1 | -3/+4 |
| * | | | | | | | | | | am: drop tty requirement for --interactive | Jeff King | 2019-05-28 | 1 | -3/+3 |
| * | | | | | | | | | | am: read interactive input from stdin | Jeff King | 2019-05-28 | 1 | -2/+4 |
| * | | | | | | | | | | am: simplify prompt response handling | Jeff King | 2019-05-28 | 1 | -3/+1 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'nd/init-relative-template-fix' into maint | Junio C Hamano | 2019-07-25 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | init: make --template path relative to $CWD | Nguyễn Thái Ngọc Duy | 2019-05-13 | 1 | -0/+3 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'js/rebase-config-bitfix' | Junio C Hamano | 2019-05-30 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | rebase: replace incorrect logical negation by correct bitwise one | Johannes Schindelin | 2019-05-28 | 1 | -1/+1 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'js/difftool-no-index' | Junio C Hamano | 2019-05-19 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | difftool --no-index: error out on --dir-diff (and don't crash) | Johannes Schindelin | 2019-05-09 | 1 | -1/+2 |
* | | | | | | | | Merge branch 'ds/midx-too-many-packs' | Junio C Hamano | 2019-05-19 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | midx: pass a repository pointer | Derrick Stolee | 2019-05-07 | 2 | -2/+2 |
* | | | | | | | | | Merge branch 'en/unicode-in-refnames' | Junio C Hamano | 2019-05-19 | 2 | -0/+5 |
|\ \ \ \ \ \ \ \ \ |