Merge branch 'wm/rev-parse-path-format-wo-arg'

Junio C Hamano committed over 5 years ago

t: use configured TAR instead of tar

Đoàn Trần Công Danh committed over 5 years ago

stash show: use stash.showIncludeUntracked even when diff options given

Denton Liu committed over 5 years ago

l10n: zh_TW.po: v2.32.0 round 1 (11 untranslated)

Yi-Jyun Pan committed over 5 years ago

diff-merges: let "-m" imply "-p"

Sergey Organov committed over 5 years ago

diff-merges: rename "combined_imply_patch" to "merges_imply_patch"

Sergey Organov committed over 5 years ago

stash list: stop passing "-m" to "git log"

Sergey Organov committed over 5 years ago

git-svn: stop passing "-m" to "git rev-list"

Sergey Organov committed over 5 years ago

diff-merges: move specific diff-index "-m" handling to diff-index

Sergey Organov committed over 5 years ago

t4013: test "git diff-index -m"

Sergey Organov committed over 5 years ago

t4013: test "git diff-tree -m"

Sergey Organov committed over 5 years ago

t4013: test "git log -m --stat"

Sergey Organov committed over 5 years ago

t4013: test "git log -m --raw"

Sergey Organov committed over 5 years ago

t4013: test that "-m" alone has no effect in "git log"

Sergey Organov committed over 5 years ago

simple-ipc: correct ifdefs when NO_PTHREADS is defined

Jeff Hostetler committed over 5 years ago

help: fix small typo in error message

Jean-Noël Avila committed over 5 years ago

trace2: refactor to avoid gcc warning under -O3

Ævar Arnfjörð Bjarmason committed over 5 years ago

Merge branch 'ds/sparse-index-protections'

Junio C Hamano committed over 5 years ago

Merge branch 'tz/c-locale-output-is-no-more'

Junio C Hamano committed over 5 years ago

Merge branch 'cs/http-use-basic-after-failed-negotiate'

Junio C Hamano committed over 5 years ago