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

builtin/apply: make gitdiff_*() return 1 at end of header

Christian Couder committed about 10 years ago

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

Christian Couder committed about 10 years ago

builtin/apply: make apply_all_patches() return 128 or 1 on error

Christian Couder committed about 10 years ago

builtin/apply: move check_apply_state() to apply.c

Christian Couder committed about 10 years ago

builtin/apply: make check_apply_state() return -1 instead of die()ing

Christian Couder committed about 10 years ago