Merge branch 'da/mergetool-winmerge'

Junio C Hamano committed over 11 years ago

Merge branch 'mc/commit-doc-grammofix'

Junio C Hamano committed over 11 years ago

Merge branch 'jh/filter-empty-contents'

Junio C Hamano committed over 11 years ago

Merge branch 'ah/usage-strings'

Junio C Hamano committed over 11 years ago

Merge branch 'jk/http-backend-deadlock'

Junio C Hamano committed over 11 years ago

Merge branch 'dt/clean-pathspec-filter-then-lstat'

Junio C Hamano committed over 11 years ago

apply: reject a hunk that does not do anything

Junio C Hamano committed over 11 years ago

suppress errors on missing UNINTERESTING links

Jeff King committed over 11 years ago

silence broken link warnings with revs->ignore_missing_links

Jeff King committed over 11 years ago

add quieter versions of parse_{tree,commit}

Jeff King committed over 11 years ago

completion: suggest sequencer commands for revert

Thomas Braun committed over 11 years ago

glossary: add "remote", "submodule", "superproject"

Stefan Beller committed over 11 years ago

setup_git_directory: delay core.bare/core.worktree errors

Jeff King committed over 11 years ago

Makefile: silence perl/PM.stamp recipe

Jeff King committed over 11 years ago

Makefile: avoid timestamp updates to GIT-BUILD-OPTIONS

Jeff King committed over 11 years ago

Makefile: drop dependency between git-instaweb and gitweb

Jeff King committed over 11 years ago

t5520: check reflog action in fast-forward merge

Paul Tan committed over 11 years ago

t5521: test --dry-run does not make any changes

Paul Tan committed over 11 years ago

t5520: test --rebase failure on unborn branch with index

Paul Tan committed over 11 years ago

t5520: test --rebase with multiple branches

Paul Tan committed over 11 years ago