Merge branch 'ls/travis-scriptify'

Junio C Hamano committed almost 9 years ago

Merge branch 'aw/gc-lockfile-fscanf-fix'

Junio C Hamano committed almost 9 years ago

Merge branch 'hv/mv-nested-submodules-test'

Junio C Hamano committed almost 9 years ago

Merge branch 'bw/git-clang-format'

Junio C Hamano committed almost 9 years ago

Merge branch 'nm/imap-send-with-curl'

Junio C Hamano committed almost 9 years ago

Merge branch 'ks/commit-do-not-touch-cut-line'

Junio C Hamano committed almost 9 years ago

Merge branch 'tg/refs-allowed-flags'

Junio C Hamano committed almost 9 years ago

Merge branch 'rs/archive-excluded-directory'

Junio C Hamano committed almost 9 years ago

Merge branch 'ks/help-alias-label'

Junio C Hamano committed almost 9 years ago

Merge branch 'jn/per-repo-object-store-fixes'

Junio C Hamano committed almost 9 years ago

Merge branch 'jk/write-in-full-fix'

Junio C Hamano committed almost 9 years ago

Merge branch 'ez/doc-duplicated-words-fix'

Junio C Hamano committed almost 9 years ago

Merge branch 'kd/doc-for-each-ref'

Junio C Hamano committed almost 9 years ago

Merge branch 'cc/subprocess-handshake-missing-capabilities'

Junio C Hamano committed almost 9 years ago

Merge branch 'kw/write-index-reduce-alloc'

Junio C Hamano committed almost 9 years ago

Merge branch 'mg/name-rev-tests-with-short-stack'

Junio C Hamano committed almost 9 years ago

parse-options: only insert newline in help text if needed

Brandon Casey committed almost 9 years ago

parse-options: write blank line to correct output stream

Brandon Casey committed almost 9 years ago

t0040,t1502: Demonstrate parse_options bugs

Brandon Casey committed almost 9 years ago

merge-strategies: avoid implying that "-s theirs" exists

Junio C Hamano committed almost 9 years ago