Merge branch 'aw/push-force-with-lease-reporting' into maint

Junio C Hamano committed over 10 years ago

Merge branch 'nd/do-not-move-worktree-manually' into maint

Junio C Hamano committed over 10 years ago

Merge branch 'js/xmerge-marker-eol' into maint

Junio C Hamano committed over 10 years ago

git-cvsserver.perl: fix typo

GyuYong Jung committed over 10 years ago

t5505: 'remote add x y' should work when url.y.insteadOf = x

Johannes Schindelin committed over 10 years ago

am -i: fix "v"iew

Junio C Hamano committed over 10 years ago

pager: factor out a helper to prepare a child process to run the pager

Junio C Hamano committed over 10 years ago

wt-status.c: set commitable bit if there is a meaningful merge.

Stephen P. Smith committed over 10 years ago

pager: lose a separate argv[]

Junio C Hamano committed over 10 years ago

config: introduce set_or_die wrappers

Patrick Steinhardt committed over 10 years ago

remote: use remote_is_configured() for add and rename

Thomas Gummerer committed over 10 years ago

remote: actually check if remote exits

Thomas Gummerer committed over 10 years ago

remote: simplify remote_is_configured()

Thomas Gummerer committed over 10 years ago

remote: use parse_config_key

Thomas Gummerer committed over 10 years ago

http: implement public key pinning

Christoph Egger committed over 10 years ago

worktree add -B: do the checkout test before update branch

Nguyễn Thái Ngọc Duy committed over 10 years ago

worktree: fix "add -B"

Nguyễn Thái Ngọc Duy committed over 10 years ago

dir.c: don't exclude whole dir prematurely

Nguyễn Thái Ngọc Duy committed over 10 years ago

dir.c: support marking some patterns already matched

Nguyễn Thái Ngọc Duy committed over 10 years ago

dir.c: support tracing exclude

Nguyễn Thái Ngọc Duy committed over 10 years ago