Merge branch 'ds/sparse-index-ignored-files' into sg/test-split-index-fix

Junio C Hamano committed almost 5 years ago

sparse-checkout: clear tracked sparse dirs

Derrick Stolee committed almost 5 years ago

sparse-index: add SPARSE_INDEX_MEMORY_ONLY flag

Derrick Stolee committed almost 5 years ago

attr: be careful about sparse directories

Derrick Stolee committed almost 5 years ago

sparse-checkout: create helper methods

Derrick Stolee committed almost 5 years ago

sparse-index: use WRITE_TREE_MISSING_OK

Derrick Stolee committed almost 5 years ago

sparse-index: silently return when cache tree fails

Derrick Stolee committed almost 5 years ago

unpack-trees: fix nested sparse-dir search

Derrick Stolee committed almost 5 years ago

sparse-index: silently return when not using cone-mode patterns

Derrick Stolee committed almost 5 years ago

t7519: rewrite sparse index test

Derrick Stolee committed almost 5 years ago

pack-write: skip *.rev work when not writing *.rev

Ævar Arnfjörð Bjarmason committed almost 5 years ago

sequencer: restrict scope of a formerly public function

Johannes Schindelin committed almost 5 years ago

rebase: remove a no-longer-used function

Johannes Schindelin committed almost 5 years ago

rebase: stop mentioning the -p option in comments

Johannes Schindelin committed almost 5 years ago

rebase: remove obsolete code comment

Johannes Schindelin committed almost 5 years ago

rebase: drop the internal `rebase--interactive` command

Johannes Schindelin committed almost 5 years ago

git-svn: drop support for `--preserve-merges`

Johannes Schindelin committed almost 5 years ago

rebase: drop support for `--preserve-merges`

Johannes Schindelin committed almost 5 years ago

pull: remove support for `--rebase=preserve`

Johannes Schindelin committed almost 5 years ago

tests: stop testing `git rebase --preserve-merges`

Johannes Schindelin committed almost 5 years ago