Merge branch 'ed/fsmonitor-on-networked-macos'

Junio C Hamano committed almost 4 years ago

rebase: cleanup action handling

Phillip Wood committed almost 4 years ago

rebase --abort: improve reflog message

Phillip Wood committed almost 4 years ago

rebase --apply: make reflog messages match rebase --merge

Phillip Wood committed almost 4 years ago

rebase --apply: respect GIT_REFLOG_ACTION

Phillip Wood committed almost 4 years ago

rebase --merge: fix reflog message after skipping

Phillip Wood committed almost 4 years ago

rebase --merge: fix reflog when continuing

Phillip Wood committed almost 4 years ago

t3406: rework rebase reflog tests

Phillip Wood committed almost 4 years ago

rebase --apply: remove duplicated code

Phillip Wood committed almost 4 years ago

Merge branch 'pw/rebase-keep-base-fixes' into pw/rebase-reflog-fixes

Junio C Hamano committed almost 4 years ago

rebase --keep-base: imply --no-fork-point

Phillip Wood committed almost 4 years ago

rebase --keep-base: imply --reapply-cherry-picks

Phillip Wood committed almost 4 years ago

rebase: factor out branch_base calculation

Phillip Wood committed almost 4 years ago

rebase: rename merge_base to branch_base

Phillip Wood committed almost 4 years ago

rebase: store orig_head as a commit

Phillip Wood committed almost 4 years ago

rebase: be stricter when reading state files containing oids

Phillip Wood committed almost 4 years ago

t3416: set $EDITOR in subshell

Phillip Wood committed almost 4 years ago

t3416: tighten two tests

Phillip Wood committed almost 4 years ago

t1002: modernize outdated conditional

Nsengiyumva Wilberforce committed almost 4 years ago

pack-bitmap-write.c: instrument number of reused bitmaps

Taylor Blau committed almost 4 years ago