Merge branch 'ps/stash-in-c'

Junio C Hamano committed over 7 years ago

clone: do faster object check for partial clones

Josh Steadmon committed over 7 years ago

worktree: update is_bare heuristics

Jonathan Tan committed over 7 years ago

rebase -i: run without forking rebase--interactive

Phillip Wood committed over 7 years ago

rebase: use a common action enum

Phillip Wood committed over 7 years ago

rebase -i: use struct rebase_options in do_interactive_rebase()

Phillip Wood committed over 7 years ago

rebase -i: use struct rebase_options to parse args

Phillip Wood committed over 7 years ago

rebase -i: use struct object_id for squash_onto

Phillip Wood committed over 7 years ago

rebase -i: use struct commit when parsing options

Phillip Wood committed over 7 years ago

rebase -i: remove duplication

Phillip Wood committed over 7 years ago

rebase -i: combine rebase--interactive.c with rebase.c

Phillip Wood committed over 7 years ago

rebase: use OPT_RERERE_AUTOUPDATE()

Phillip Wood committed over 7 years ago

rebase: rename write_basic_state()

Phillip Wood committed over 7 years ago

rebase: don't translate trace strings

Phillip Wood committed over 7 years ago

sequencer: always discard index after checkout

Phillip Wood committed over 7 years ago

Merge branch 'ag/sequencer-reduce-rewriting-todo' into pw/rebase-i-internal

Junio C Hamano committed over 7 years ago

untracked-cache: simplify parsing by dropping "len"

Jeff King committed over 7 years ago

untracked-cache: simplify parsing by dropping "next"

Jeff King committed over 7 years ago

untracked-cache: be defensive about missing NULs in index

Jeff King committed over 7 years ago

t5304: add a test for pruning with bitmaps

Jeff King committed over 7 years ago