difftool: retire the scripted version

Johannes Schindelin committed over 9 years ago

difftool: implement the functionality in the builtin

Johannes Schindelin committed over 9 years ago

doc: add documentation for OPT_STRING_LIST

Jacob Keller committed over 9 years ago

documentation: retire unfinished documentation

Stefan Beller committed over 9 years ago

cache.h: document add_[file_]to_index

Stefan Beller committed over 9 years ago

cache.h: document remove_index_entry_at

Stefan Beller committed over 9 years ago

cache.h: document index_name_pos

Stefan Beller committed over 9 years ago

color.c: trim leading spaces in color_parse_mem()

Nguyễn Thái Ngọc Duy committed over 9 years ago

color.c: fix color_parse_mem() with value_len == 0

Nguyễn Thái Ngọc Duy committed over 9 years ago

clear_delta_base_cache(): don't modify hashmap while iterating

Jeff King committed over 9 years ago

Sixth batch for 2.12

Junio C Hamano committed over 9 years ago

Merge branch 'sb/remove-gitview'

Junio C Hamano committed over 9 years ago

Merge branch 'js/asciidoctor-tweaks'

Junio C Hamano committed over 9 years ago

Merge branch 'sb/unpack-trees-cleanup'

Junio C Hamano committed over 9 years ago

Merge branch 'rh/mergetool-regression-fix'

Junio C Hamano committed over 9 years ago

Merge branch 'bw/realpath-wo-chdir'

Junio C Hamano committed over 9 years ago

Merge branch 'jk/execv-dashed-external'

Junio C Hamano committed over 9 years ago

Merge branch 'sp/cygwin-build-fixes'

Junio C Hamano committed over 9 years ago

Merge branch 'sb/pathspec-errors'

Junio C Hamano committed over 9 years ago

Merge branch 'pb/test-must-fail-is-for-git'

Junio C Hamano committed over 9 years ago