Update 1.7.8 draft release notes in preparation for rc4

Junio C Hamano committed almost 15 years ago

Merge branch 'jn/revert-quit'

Junio C Hamano committed almost 15 years ago

revert: remove --reset compatibility option

Jonathan Nieder committed almost 15 years ago

revert: introduce --abort to cancel a failed cherry-pick

Jonathan Nieder committed almost 15 years ago

revert: write REVERT_HEAD pseudoref during conflicted revert

Jonathan Nieder committed almost 15 years ago

revert: improve error message for cherry-pick during cherry-pick

Jonathan Nieder committed almost 15 years ago

revert: rearrange pick_revisions() for clarity

Jonathan Nieder committed almost 15 years ago

revert: rename --reset option to --quit

Jonathan Nieder committed almost 15 years ago

Merge branch 'jk/maint-1.6.2-upload-archive' into jk/maint-upload-archive

Junio C Hamano committed almost 15 years ago

archive: don't let remote clients get unreachable commits

Jeff King committed almost 15 years ago

upload-archive: use start_command instead of fork

Jeff King committed almost 15 years ago

Merge branch 'maint'

Junio C Hamano committed almost 15 years ago

Merge branch 'rr/misc-fixes'

Junio C Hamano committed almost 15 years ago

convert.c: Fix return type of git_path_check_eol()

Ramsay Jones committed almost 15 years ago

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