rebase: add and use git_rebase__interactive__preserve_merges

Wink Saville committed over 8 years ago

rebase: extract functions out of git_rebase__interactive

Wink Saville committed over 8 years ago

rebase: reindent function git_rebase__interactive

Wink Saville committed over 8 years ago

rebase: update invocation of rebase dot-sourced scripts

Wink Saville committed over 8 years ago

l10n: fr.po: v2.17.0 no fuzzy

Jean-Noël Avila committed over 8 years ago

t9902: disable test on the list of merge-strategies under GETTEXT_POISON

Junio C Hamano committed over 8 years ago

object-store: free alt_odb_list

Stefan Beller committed over 8 years ago

object-store: move alt_odb_list and alt_odb_tail to object store

Stefan Beller committed over 8 years ago

object-store: migrate alternates struct and functions from cache.h

Stefan Beller committed over 8 years ago

repository: introduce raw object store field

Stefan Beller committed over 8 years ago

repository.h: add comment and clarify repo_set_gitdir

Nguyễn Thái Ngọc Duy committed over 8 years ago

rebase-interactive: simplify pick_on_preserving_merges

Wink Saville committed over 8 years ago

Sync with Git 2.16.3

Junio C Hamano committed over 8 years ago

Git 2.16.3

Junio C Hamano committed over 8 years ago

Merge branch 'ms/non-ascii-ticks' into maint

Junio C Hamano committed over 8 years ago

Merge branch 'jk/cached-commit-buffer' into maint

Junio C Hamano committed over 8 years ago

Merge branch 'sm/mv-dry-run-update' into maint

Junio C Hamano committed over 8 years ago

Merge branch 'tg/worktree-create-tracking' into maint

Junio C Hamano committed over 8 years ago

Merge branch 'gs/test-unset-xdg-cache-home' into maint

Junio C Hamano committed over 8 years ago

Merge branch 'sb/status-doc-fix' into maint

Junio C Hamano committed over 8 years ago