Merge branch 'oc/mergetools-beyondcompare'

Junio C Hamano committed almost 12 years ago

Merge branch 'jk/prune-mtime'

Junio C Hamano committed almost 12 years ago

Merge branch 'bc/asciidoctor'

Junio C Hamano committed almost 12 years ago

api-run-command: add missing list item marker

René Scharfe committed almost 12 years ago

use child_process_init() to initialize struct child_process variables

René Scharfe committed almost 12 years ago

receive-pack: avoid minor leak in case start_async() fails

René Scharfe committed almost 12 years ago

merge & sequencer: turn "Conflicts:" hint into a comment

Junio C Hamano committed almost 12 years ago

builtin/commit.c: extract ignore_non_trailer() helper function

Junio C Hamano committed almost 12 years ago

difftool: add support for --trust-exit-code

David Aguilar committed almost 12 years ago

grep: add color.grep.matchcontext and color.grep.matchselected

René Scharfe committed almost 12 years ago

config.txt: pack.windowmemory limit applies per-thread

Robert de Bath committed almost 12 years ago

strbuf_add_commented_lines(): avoid SP-HT sequence in commented lines

Junio C Hamano committed almost 12 years ago

t/lib-gpg: make gpghome files writable

Michael J Gruber committed almost 12 years ago

Documentation: remove Asciidoctor linkgit macro

brian m. carlson committed almost 12 years ago

Documentation: refactor common operations into variables

brian m. carlson committed almost 12 years ago

compat/bswap.h: detect endianness from XL C compiler macros

David Michael committed almost 12 years ago

Makefile: reorder linker flags in the git executable rule

David Michael committed almost 12 years ago

git-compat-util.h: support variadic macros with the XL C compiler

David Michael committed almost 12 years ago

difftool--helper: exit when reading a prompt answer fails

Johannes Sixt committed almost 12 years ago

git-svn: disable _rev_list memoization

Eric Wong committed almost 12 years ago