Merge branch 'ab/send-email-optim'

Junio C Hamano committed about 5 years ago

Merge branch 'jk/typofix'

Junio C Hamano committed about 5 years ago

SubmittingPatches: replace discussion of Travis with GitHub Actions

Ævar Arnfjörð Bjarmason committed about 5 years ago

SubmittingPatches: move discussion of Signed-off-by above "send"

Ævar Arnfjörð Bjarmason committed about 5 years ago

pull: fix handling of multiple heads

Elijah Newren committed about 5 years ago

pull: update docs & code for option compatibility with rebasing

Elijah Newren committed about 5 years ago

pull: abort by default when fast-forwarding is not possible

Elijah Newren committed about 5 years ago

pull: make --rebase and --no-rebase override pull.ff=only

Elijah Newren committed about 5 years ago

pull: since --ff-only overrides, handle it first

Elijah Newren committed about 5 years ago

Makefile: don't use "FORCE" for tags targets

Ævar Arnfjörð Bjarmason committed about 5 years ago

doc: pull: fix rebase=false documentation

Felipe Contreras committed about 5 years ago

test-lib tests: move "run_sub_test" to a new lib-subtest.sh

Ævar Arnfjörð Bjarmason committed about 5 years ago

Merge branch 'ps/t0000-output-directory-fix' into ab/lib-subtest

Junio C Hamano committed about 5 years ago

Merge branch 'jk/t0000-subtests-fix' into ab/lib-subtest

Junio C Hamano committed about 5 years ago

pull: abort if --ff-only is given and fast-forwarding is impossible

Alex Henrie committed about 5 years ago

t7601: add tests of interactions with multiple merge heads and config

Elijah Newren committed about 5 years ago

t7601: test interaction of merge/rebase/fast-forward flags and options

Elijah Newren committed about 5 years ago

pack-bitmap: clarify comment in filter_bitmap_exclude_type()

Taylor Blau committed about 5 years ago

unpack-trees: resolve sparse-directory/file conflicts

Derrick Stolee committed about 5 years ago

t1092: document bad 'git checkout' behavior

Derrick Stolee committed about 5 years ago