Merge branch 'jc/resolve-undo'

Junio C Hamano committed about 4 years ago

compat/win32: correct for incorrect compiler warning

Derrick Stolee committed about 4 years ago

sequencer: notify user of --update-refs activity

Derrick Stolee committed about 4 years ago

sequencer: ignore HEAD ref under --update-refs

Derrick Stolee committed about 4 years ago

rebase: add rebase.updateRefs config option

Derrick Stolee committed about 4 years ago

sequencer: rewrite update-refs as user edits todo list

Derrick Stolee committed about 4 years ago

rebase: update refs from 'update-ref' commands

Derrick Stolee committed about 4 years ago

rebase: add --update-refs option

Derrick Stolee committed about 4 years ago

sequencer: add update-ref command

Derrick Stolee committed about 4 years ago

sequencer: define array with enum values

Derrick Stolee committed about 4 years ago

rebase-interactive: update 'merge' description

Derrick Stolee committed about 4 years ago

branch: consider refs under 'update-refs'

Derrick Stolee committed about 4 years ago

t2407: test branches currently using apply backend

Derrick Stolee committed about 4 years ago

t2407: test bisect and rebase as black-boxes

Derrick Stolee committed about 4 years ago

transport.c: avoid "whitelist"

Derrick Stolee committed about 4 years ago

t: avoid "whitelist"

Derrick Stolee committed about 4 years ago

git.txt: remove redundant language

Derrick Stolee committed about 4 years ago

git-cvsserver: clarify directory list

Derrick Stolee committed about 4 years ago

daemon: clarify directory arguments

Derrick Stolee committed about 4 years ago

osx-keychain: fix compiler warning

Lessley Dennington committed about 4 years ago