diff-lib: define diff_get_merge_base()

Denton Liu committed almost 6 years ago

diff-lib: accept option flags in run_diff_index()

Denton Liu committed almost 6 years ago

docs: explain how to deal with files that are always modified

brian m. carlson committed almost 6 years ago

docs: explain why reverts are not always applied on merge

brian m. carlson committed almost 6 years ago

docs: explain why squash merges are broken with long-running branches

brian m. carlson committed almost 6 years ago

send-pack: run GPG after atomic push checking

Han Xin committed almost 6 years ago

Makefile: use git-archive --add-file

René Scharfe committed almost 6 years ago

archive: add --add-file

René Scharfe committed almost 6 years ago

archive: read short blobs in archive.c::write_archive_entry()

René Scharfe committed almost 6 years ago

git-p4: use HEAD~$n to find parent commit for unshelve

Luke Diamand committed almost 6 years ago

git-p4 unshelve: adding a commit breaks git-p4 unshelve

Luke Diamand committed almost 6 years ago

pack-write: use hashwrite_be32() in write_idx_file()

René Scharfe committed almost 6 years ago

Fifteenth batch

Junio C Hamano committed almost 6 years ago

Merge branch 'mt/config-fail-nongit-early'

Junio C Hamano committed almost 6 years ago

Merge branch 'jc/dist-tarball-tweak'

Junio C Hamano committed almost 6 years ago

Merge branch 'mf/submodule-summary-with-correct-repository'

Junio C Hamano committed almost 6 years ago

Merge branch 'jc/quote-path-cleanup'

Junio C Hamano committed almost 6 years ago

Merge branch 'os/collect-changed-submodules-optim'

Junio C Hamano committed almost 6 years ago

Merge branch 'es/wt-add-detach'

Junio C Hamano committed almost 6 years ago

Merge branch 'jk/add-i-fixes'

Junio C Hamano committed almost 6 years ago