rerere: prepare for customizable conflict marker length

Junio C Hamano committed almost 17 years ago

commit.c::print_summary: do not release the format string too early

Junio C Hamano committed almost 17 years ago

conflict-marker-size: new attribute

Junio C Hamano committed almost 17 years ago

rerere: use ll_merge() instead of using xdl_merge()

Junio C Hamano committed almost 17 years ago

merge-tree: use ll_merge() not xdl_merge()

Junio C Hamano committed almost 17 years ago

xdl_merge(): allow passing down marker_size in xmparam_t

Junio C Hamano committed almost 17 years ago

xdl_merge(): introduce xmparam_t for merge specific parameters

Junio C Hamano committed almost 17 years ago

git_attr(): fix function signature

Junio C Hamano committed almost 17 years ago

Do not use date.c:tm_to_time_t() from compat/mingw.c

Johannes Sixt committed almost 17 years ago

MSVC: Windows-native implementation for subset of Pthreads API

Andrzej K. Haczewski committed almost 17 years ago

Merge branch 'maint'

Junio C Hamano committed almost 17 years ago

Merge branch 'cc/reset-more'

Junio C Hamano committed almost 17 years ago

Documentation: Update git core tutorial clarifying reference to scripts

Ramkumar Ramachandra committed almost 17 years ago

MSVC: Fix an "incompatible pointer types" compiler warning

Ramsay Jones committed almost 17 years ago

Windows: avoid the "dup dance" when spawning a child process

Johannes Sixt committed almost 17 years ago

Windows: simplify the pipe(2) implementation

Johannes Sixt committed almost 17 years ago

Windows: boost startup by avoiding a static dependency on shell32.dll

Johannes Sixt committed almost 17 years ago

Windows: disable Python

Erik Faye-Lund committed almost 17 years ago

Teach diff that modified submodule directory is dirty

Junio C Hamano committed almost 17 years ago

Show submodules as modified when they contain a dirty work tree

Jens Lehmann committed almost 17 years ago