Merge branch 'js/name-rev-use-oldest-ref' into maint

Junio C Hamano committed over 10 years ago

rebase -i: remove an unnecessary 'rerere' invocation

Johannes Sixt committed over 10 years ago

perf: make the tests work without a worktree

René Scharfe committed over 10 years ago

grep: -W: don't extend context to trailing empty lines

René Scharfe committed over 10 years ago

t7810: add test for grep -W and trailing empty context lines

René Scharfe committed over 10 years ago

xdiff: don't trim common tail with -W

René Scharfe committed over 10 years ago

xdiff: -W: don't include common trailing empty lines in context

René Scharfe committed over 10 years ago

xdiff: ignore empty lines before added functions with -W

René Scharfe committed over 10 years ago

xdiff: handle appended chunks better with -W

René Scharfe committed over 10 years ago

xdiff: factor out match_func_rec()

René Scharfe committed over 10 years ago

t4051: rewrite, add more tests

René Scharfe committed over 10 years ago

Merge branch 'es/t1500-modernize'

Junio C Hamano committed over 10 years ago

Merge branch 'jk/cat-file-buffered-batch-all'

Junio C Hamano committed over 10 years ago

Merge branch 'fc/fast-import-broken-marks-file'

Junio C Hamano committed over 10 years ago

worktree: allow "-" short-hand for @{-1} in add command

Jordan DE GEA committed over 10 years ago

Documentation: bold literals in man

Erwan Mathoniere committed over 10 years ago

l10n: pt_PT: update Portuguese translation

Vasco Almeida committed over 10 years ago

l10n: pt_PT: update according to git-gui glossary

Vasco Almeida committed over 10 years ago

l10n: pt_PT: merge git.pot file

Vasco Almeida committed over 10 years ago

upload-pack.c: use parse-options API

Antoine Queru committed over 10 years ago