Show error for 'git merge' with unset merge.defaultToUpstream

Vincent van Ravesteijn committed almost 15 years ago

documentation fix: git difftool uses diff tools, not merge tools.

Thomas Hochstein committed almost 15 years ago

config.c: Fix a static buffer overwrite bug by avoiding mkpath()

Ramsay Jones committed almost 15 years ago

t5501-*.sh: Fix url passed to clone in setup test

Ramsay Jones committed almost 15 years ago

Hopefully final update of release notes before 1.7.8 final

Junio C Hamano committed almost 15 years ago

Merge branch 'rr/misc-fixes'

Junio C Hamano committed almost 15 years ago

refresh_index: make porcelain output more specific

Jeff King committed almost 15 years ago

refresh_index: rename format variables

Jeff King committed almost 15 years ago

read-cache: let refresh_cache_ent pass up changed flags

Jeff King committed almost 15 years ago

Makefile: add option to disable automatic dependency generation

Jonathan Nieder committed almost 15 years ago

Sync with 1.7.7.4

Junio C Hamano committed almost 15 years ago

Git 1.7.7.4

Junio C Hamano committed almost 15 years ago

Merge branch 'jc/maint-name-rev-all' into maint

Junio C Hamano committed almost 15 years ago

Merge branch 'ml/mailmap' into maint

Junio C Hamano committed almost 15 years ago

Merge branch 'jn/maint-notes-avoid-va-args' into maint

Junio C Hamano committed almost 15 years ago

Makefile: add missing header file dependencies

Jonathan Nieder committed almost 15 years ago

notes merge: eliminate OUTPUT macro

Jonathan Nieder committed almost 15 years ago

do not let git_path clobber errno when reporting errors

Jonathan Nieder committed almost 15 years ago

Git 1.7.8-rc3

Junio C Hamano committed almost 15 years ago

pack-object: tolerate broken packs that have duplicated objects

Junio C Hamano committed almost 15 years ago