Post 2.3 cycle (batch #7)

Junio C Hamano committed over 11 years ago

Merge branch 'ew/svn-fixes'

Junio C Hamano committed over 11 years ago

Merge branch 'ew/svn-maint-fixes'

Junio C Hamano committed over 11 years ago

Merge branch 'tb/connect-ipv6-parse-fix'

Junio C Hamano committed over 11 years ago

Merge branch 'jc/diff-test-updates'

Junio C Hamano committed over 11 years ago

Merge branch 'rs/simple-cleanups'

Junio C Hamano committed over 11 years ago

Merge branch 'rj/no-xopen-source-for-cygwin'

Junio C Hamano committed over 11 years ago

Merge branch 'mm/am-c-doc'

Junio C Hamano committed over 11 years ago

Merge branch 'mh/refs-have-new'

Junio C Hamano committed over 11 years ago

reflog_expire(): never update a reference to null_sha1

Michael Haggerty committed over 11 years ago

reflog_expire(): ignore --updateref for symbolic references

Michael Haggerty committed over 11 years ago

reflog: improve and update documentation

Michael Haggerty committed over 11 years ago

struct ref_lock: delete the force_write member

Stefan Beller committed over 11 years ago

lock_ref_sha1_basic(): do not set force_write for missing references

Michael Haggerty committed over 11 years ago

write_ref_sha1(): move write elision test to callers

Michael Haggerty committed over 11 years ago

write_ref_sha1(): remove check for lock == NULL

Michael Haggerty committed over 11 years ago

log --decorate: do not leak "commit" color into the next item

Junio C Hamano committed over 11 years ago

Documentation/config.txt: simplify boolean description in the syntax section

Junio C Hamano committed over 11 years ago

Documentation/config.txt: describe 'color' value type in the "Values" section

Junio C Hamano committed over 11 years ago

Documentation/config.txt: have a separate "Values" section

Junio C Hamano committed over 11 years ago