Merge branch 'jc/maint-branch-mergeoptions' into maint

Junio C Hamano committed over 15 years ago

Merge branch 'jc/maint-add-p-overlapping-hunks' into maint

Junio C Hamano committed over 15 years ago

Documentation/git-fsck.txt: fix typo: unreadable -> unreachable

Jim Meyering committed over 15 years ago

send-pack: avoid deadlock on git:// push with failed pack-objects

Jeff King committed over 15 years ago

connect: let callers know if connection is a socket

Jeff King committed over 15 years ago

connect: treat generic proxy processes like ssh processes

Jeff King committed over 15 years ago

sideband_demux(): fix decl-after-stmt

Junio C Hamano committed over 15 years ago

t3503: test cherry picking and reverting root commits

Jeff King committed over 15 years ago

revert: allow reverting a root commit

Jeff King committed over 15 years ago

cherry-pick: handle root commits with external strategies

Jeff King committed over 15 years ago

git-gui: Corrected a typo in the Swedish translation of 'Continue'

Christoffer Pettersson committed over 15 years ago

Makefile: Pass USE_LIBPCRE down in GIT-BUILD-OPTIONS

Junio C Hamano committed over 15 years ago

git-grep: update tests now regexp type is "last one wins"

Junio C Hamano committed over 15 years ago

Merge branches 'jc/convert', 'jc/bigfile' and 'jc/replacing' into jc/streaming

Junio C Hamano committed over 15 years ago

Sync release notes for 1.7.6 to exclude what are in maintenance track

Junio C Hamano committed over 15 years ago

Merge branch 'maint'

Junio C Hamano committed over 15 years ago

Update draft release notes to 1.7.5.2

Junio C Hamano committed over 15 years ago

Merge branch 'cn/format-patch-quiet' into maint

Junio C Hamano committed over 15 years ago

Merge branch 'jm/mergetool-submodules' into maint

Junio C Hamano committed over 15 years ago

Merge branch 'jk/format-patch-quote-special-in-from' into maint

Junio C Hamano committed over 15 years ago