Teach merge the '[-e|--edit]' option

Jay Soffian committed about 15 years ago

Update draft release notes to 1.7.8

Junio C Hamano committed about 15 years ago

Merge branch 'cb/do-not-pretend-to-hijack-long-help'

Junio C Hamano committed about 15 years ago

Merge branch 'sp/smart-http-failure'

Junio C Hamano committed about 15 years ago

Merge branch 'nd/document-err-packet'

Junio C Hamano committed about 15 years ago

Merge branch 'jc/parse-options-boolean'

Junio C Hamano committed about 15 years ago

Merge branch 'rs/test-ctype'

Junio C Hamano committed about 15 years ago

Merge branch 'rs/name-rev-usage'

Junio C Hamano committed about 15 years ago

Merge branch 'cs/perl-config-path-send-email'

Junio C Hamano committed about 15 years ago

Merge branch 'zj/send-email-authen-sasl'

Junio C Hamano committed about 15 years ago

t5403: convert leading spaces to tabs

Nguyễn Thái Ngọc Duy committed about 15 years ago

fix "git apply --index ..." not to deref NULL

Jim Meyering committed about 15 years ago

t1300: test mixed-case variable retrieval

Jeff King committed about 15 years ago

t1300: put git invocations inside test function

Jeff King committed about 15 years ago

refs.c: move dwim_ref()/dwim_log() from sha1_name.c

Junio C Hamano committed about 15 years ago

branch -m/-M: remove undocumented RENAMED-REF

Junio C Hamano committed about 15 years ago

Fix is_gitfile() for files too small or larger than PATH_MAX to be a gitfile

Johannes Schindelin committed about 15 years ago

attr.c: respect core.ignorecase when matching attribute patterns

Brandon Casey committed about 15 years ago

Update draft release notes to 1.7.8

Junio C Hamano committed about 15 years ago

Merge branch 'dm/tree-walk'

Junio C Hamano committed about 15 years ago