Merge branch 'master' of https://github.com/Softcatala/git-po into maint

Jiang Xin committed over 9 years ago

submodule--helper: show usage for "-h"

Jeff King committed over 9 years ago

remote-{ext,fd}: print usage message on invalid arguments

Jeff King committed over 9 years ago

upload-archive: handle "-h" option early

Jeff King committed over 9 years ago

credential: handle invalid arguments earlier

Jeff King committed over 9 years ago

am: handle "-h" argument earlier

Jeff King committed over 9 years ago

submodule loading: separate code path for .gitmodules and config overlay

Stefan Beller committed over 9 years ago

reset/checkout/read-tree: unify config callback for submodule recursion

Stefan Beller committed over 9 years ago

submodule test invocation: only pass additional arguments

Stefan Beller committed over 9 years ago

submodule recursing: do not write a config variable twice

Stefan Beller committed over 9 years ago

Merge branch 'ab/grep-preparatory-cleanup' into sb/submodule-blanket-recursive

Junio C Hamano committed over 9 years ago

completion: add completions for git config commit

Rikard Falkeborn committed over 9 years ago

Fourth batch for 2.14

Junio C Hamano committed over 9 years ago

Merge branch 'dt/unpack-save-untracked-cache-extension'

Junio C Hamano committed over 9 years ago

Merge branch 'js/larger-timestamps'

Junio C Hamano committed over 9 years ago

Merge branch 'dk/send-email-avoid-net-smtp-ssl-when-able'

Junio C Hamano committed over 9 years ago

Merge branch 'jc/skip-test-in-the-middle'

Junio C Hamano committed over 9 years ago

Merge branch 'ab/conditional-config-with-symlinks'

Junio C Hamano committed over 9 years ago

Merge branch 'jt/fetch-allow-tip-sha1-implicitly'

Junio C Hamano committed over 9 years ago

Merge branch 'jt/send-email-validate-hook'

Junio C Hamano committed over 9 years ago