string_list: add function string_list_append_nodup()

Michael Haggerty committed about 14 years ago

Merge git://ozlabs.org/~paulus/gitk

Junio C Hamano committed about 14 years ago

Merge branch 'da/gitk-reload-tag-contents'

Junio C Hamano committed about 14 years ago

Merge branch 'da/gitk-reload-tag-contents' of git://github.com/gitster/git to get two commits from David Aguilar.

Paul Mackerras committed about 14 years ago

ll-merge: warn about inability to merge binary files only when we can't

Junio C Hamano committed about 14 years ago

blame: allow "blame file" in the middle of a conflicted merge

Junio C Hamano committed about 14 years ago

checkout: reorder option handling

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

Second half of the fifth batch for 1.8.0

Junio C Hamano committed about 14 years ago

Merge branch 'rj/test-regex'

Junio C Hamano committed about 14 years ago

Merge branch 'jk/argv-array'

Junio C Hamano committed about 14 years ago

Merge branch 'jc/merge-bases'

Junio C Hamano committed about 14 years ago

Merge branch 'nd/i18n-index-pack'

Junio C Hamano committed about 14 years ago

Merge branch 'jc/maint-ident-missing-human-name'

Junio C Hamano committed about 14 years ago

Sync with maint

Junio C Hamano committed about 14 years ago

Further merging down for 1.7.12.1

Junio C Hamano committed about 14 years ago

Sync with 1.7.11.6

Junio C Hamano committed about 14 years ago

Merge branch 'js/use-sc-open-max' into maint

Junio C Hamano committed about 14 years ago

Merge branch 'js/no-curl-easy-strerror-on-old-curl' into maint

Junio C Hamano committed about 14 years ago

Git 1.7.11.6

Junio C Hamano committed about 14 years ago

Merge branch 'jc/maint-mergetool-style-fix' into maint-1.7.11

Junio C Hamano committed about 14 years ago