Merge branch 'rs/merge-add-strategies-simplification'

Junio C Hamano committed about 10 years ago

Merge branch 'rs/child-process-init'

Junio C Hamano committed about 10 years ago

Merge branch 'js/import-tars-hardlinks'

Junio C Hamano committed about 10 years ago

Merge branch 'ms/document-pack-window-memory-is-per-thread'

Junio C Hamano committed about 10 years ago

Merge branch 'vs/completion-branch-fully-spelled-d-m-r'

Junio C Hamano committed about 10 years ago

Merge branch 'sb/submodule-clone-retry'

Junio C Hamano committed about 10 years ago

Git 2.9.3

Junio C Hamano committed about 10 years ago

Merge branch 'jk/difftool-in-subdir' into maint

Junio C Hamano committed about 10 years ago

Merge branch 'jk/reset-ident-time-per-commit' into maint

Junio C Hamano committed about 10 years ago

rebase: avoid computing unnecessary patch IDs

Kevin Willford committed about 10 years ago

Spelling fixes

Ville Skyttä committed about 10 years ago

builtin/apply: make write_out_results() return -1 on error

Christian Couder committed about 10 years ago

builtin/apply: make write_out_one_result() return -1 on error

Christian Couder committed about 10 years ago

builtin/apply: make create_file() return -1 on error

Christian Couder committed about 10 years ago

builtin/apply: make add_index_file() return -1 on error

Christian Couder committed about 10 years ago

builtin/apply: make add_conflicted_stages_file() return -1 on error

Christian Couder committed about 10 years ago

builtin/apply: make remove_file() return -1 on error

Christian Couder committed about 10 years ago

builtin/apply: make build_fake_ancestor() return -1 on error

Christian Couder committed about 10 years ago

builtin/apply: change die_on_unsafe_path() to check_unsafe_path()

Christian Couder committed about 10 years ago

builtin/apply: make gitdiff_*() return -1 on error

Christian Couder committed about 10 years ago