Merge branch 'jk/no-system-includes-in-dot-c'

Junio C Hamano committed about 7 years ago

tree-walk: drop oid from traverse_info

Jeff King committed about 7 years ago

setup_traverse_info(): stop copying oid

Jeff King committed about 7 years ago

repack: simplify handling of auto-bitmaps and .keep files

Jeff King committed about 7 years ago

repack: silence warnings when auto-enabled bitmaps cannot be built

Jeff King committed about 7 years ago

t7700: clean up .keep file in bitmap-writing test

Jeff King committed about 7 years ago

rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`

Johannes Schindelin committed about 7 years ago

t3418: test `rebase -r` with merge strategies

Johannes Schindelin committed about 7 years ago

t/lib-rebase: prepare for testing `git rebase --rebase-merges`

Johannes Schindelin committed about 7 years ago

rebase -r: support merge strategies other than `recursive`

Johannes Schindelin committed about 7 years ago

t3427: fix another incorrect assumption

Johannes Schindelin committed about 7 years ago

t3427: accommodate for the `rebase --merge` backend having been replaced

Johannes Schindelin committed about 7 years ago

t3427: fix erroneous assumption

Johannes Schindelin committed about 7 years ago

t3427: condense the unnecessarily repetitive test cases into three

Johannes Schindelin committed about 7 years ago

t3427: move the `filter-branch` invocation into the `setup` case

Johannes Schindelin committed about 7 years ago

t3427: simplify the `setup` test case significantly

Johannes Schindelin committed about 7 years ago

t3427: add a clarifying comment

Johannes Schindelin committed about 7 years ago

rebase: fold git-rebase--common into the -p backend

Johannes Schindelin committed about 7 years ago

sequencer: the `am` and `rebase--interactive` scripts are gone

Johannes Schindelin committed about 7 years ago

.gitignore: there is no longer a built-in `git-rebase--interactive`

Johannes Schindelin committed about 7 years ago