merge-recursive: check GIT_MERGE_VERBOSITY only once

Andrey Okoshkin committed almost 9 years ago

add, reset: use DIFF_OPT_SET macro to set a diff flag

Brandon Williams committed almost 9 years ago

status: test ignored modes

Jameson Miller committed almost 9 years ago

status: document options to show matching ignored files

Jameson Miller committed almost 9 years ago

status: report matching ignored and normal untracked

Jameson Miller committed almost 9 years ago

status: add option to show ignored files differently

Jameson Miller committed almost 9 years ago

t0000: check whether the shell supports the "local" keyword

Michael Haggerty committed almost 9 years ago

Git 2.15

Junio C Hamano committed almost 9 years ago

Documentation: enable compat-mode for Asciidoctor

brian m. carlson committed almost 9 years ago

fsmonitor: document GIT_TRACE_FSMONITOR

Alex Vandiver committed almost 9 years ago

fsmonitor: don't bother pretty-printing JSON from watchman

Alex Vandiver committed almost 9 years ago

fsmonitor: set the PWD to the top of the working tree

Alex Vandiver committed almost 9 years ago

files-backend: don't rewrite the `packed-refs` file unnecessarily

Michael Haggerty committed almost 9 years ago

Merge tag 'l10n-2.15.0-rnd2.1' of git://github.com/git-l10n/git-po

Junio C Hamano committed almost 9 years ago

l10n: Update Catalan translation

Jordi Mas committed almost 9 years ago

diff: fix lstat() error handling in diff_populate_filespec()

Andrey Okoshkin committed almost 9 years ago

Merge branch 'bc/object-id' into base

Michael Haggerty committed almost 9 years ago

Hopefully final batch before 2.15

Junio C Hamano committed almost 9 years ago

Merge branch 'sg/rev-list-doc-reorder-fix'

Junio C Hamano committed almost 9 years ago

Merge branch 'sb/rev-parse-show-superproject-root'

Junio C Hamano committed almost 9 years ago