Merge branch 'pw/diff-color-moved-fix'

Junio C Hamano committed over 4 years ago

Merge branch 'xw/am-empty'

Junio C Hamano committed over 4 years ago

Merge branch 'en/keep-cwd'

Junio C Hamano committed over 4 years ago

Merge branch 'jc/flex-array-definition'

Junio C Hamano committed over 4 years ago

Merge branch 'jh/p4-rcs-expansion-in-bytestring'

Junio C Hamano committed over 4 years ago

i18n: turn even more messages into "cannot be used together" ones

Jean-Noël Avila committed over 4 years ago

i18n: ref-filter: factorize "%(foo) atom used without %(bar) atom"

Jean-Noël Avila committed over 4 years ago

i18n: factorize "--foo outside a repository"

Jean-Noël Avila committed over 4 years ago

i18n: refactor "unrecognized %(foo) argument" strings

Jean-Noël Avila committed over 4 years ago

i18n: factorize "no directory given for --foo"

Jean-Noël Avila committed over 4 years ago

i18n: factorize "--foo requires --bar" and the like

Jean-Noël Avila committed over 4 years ago

i18n: tag.c factorize i18n strings

Jean-Noël Avila committed over 4 years ago

i18n: standardize "cannot open" and "cannot read"

Jean-Noël Avila committed over 4 years ago

i18n: turn "options are incompatible" into "cannot be used together"

Jean-Noël Avila committed over 4 years ago

i18n: refactor "%s, %s and %s are mutually exclusive"

Jean-Noël Avila committed over 4 years ago

i18n: refactor "foo and bar are mutually exclusive"

Jean-Noël Avila committed over 4 years ago

grep: align default colors with GNU grep ones

Lénaïc Huard committed over 4 years ago

t/README: fix typo

Marc Strapetz committed over 4 years ago

stash: do not return before restoring untracked files

Elijah Newren committed over 4 years ago

Merge branch 'ab/reflog-prep' into jc/reflog-parse-options

Junio C Hamano committed over 4 years ago