Merge branch 'js/detached-stash'

Junio C Hamano committed about 16 years ago

Merge branch 'js/maint-reflog-beyond-horizon'

Junio C Hamano committed about 16 years ago

Merge branch 'dg/local-mod-error-messages'

Junio C Hamano committed about 16 years ago

Merge branch 'nd/maint-fix-replace'

Junio C Hamano committed about 16 years ago

parse_object: pass on the original sha1, not the replaced one

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

RE: [PATCH] Avoid rename/add conflict when contents are identical

Schalk, Ken committed about 16 years ago

Merge branch 'ab/compat-regex'

Junio C Hamano committed about 16 years ago

Merge branch 'nd/clone-depth-zero'

Junio C Hamano committed about 16 years ago

Merge branch 'jn/maint-doc-user-manual-html-doctype'

Junio C Hamano committed about 16 years ago

Merge branch 'cb/maint-mergetool-no-tty'

Junio C Hamano committed about 16 years ago

Merge branch 'jn/apply-filename-with-sp'

Junio C Hamano committed about 16 years ago

Merge branch 'jn/merge-custom-no-trivial'

Junio C Hamano committed about 16 years ago

Merge branch 'jc/maint-doc-em-dash'

Junio C Hamano committed about 16 years ago

Merge branch 'mg/doc-bundle'

Junio C Hamano committed about 16 years ago

Merge branch 'jn/doc-backslash'

Junio C Hamano committed about 16 years ago

Merge branch 'jn/update-contrib-example-merge'

Junio C Hamano committed about 16 years ago

Merge branch 'jn/merge-renormalize'

Junio C Hamano committed about 16 years ago

Sync with 1.7.2.3

Junio C Hamano committed about 16 years ago

Git 1.7.2.3

Junio C Hamano committed about 16 years ago

builtin/merge_recursive.c: Add an usage string and make use of it.

Thiago Farina committed about 16 years ago