diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-02-13 13:39:15 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-02-13 13:39:15 -0800 |
commit | 0f57f731ea2a540a4c82b476054e8a36aebb2314 (patch) | |
tree | 7d71894a78d4b3acd828861c2c15e314ee18a0a4 /builtin/merge-ours.c | |
parent | Merge branch 'nd/shared-index-fix' (diff) | |
parent | sequencer: run 'prepare-commit-msg' hook (diff) | |
download | tgif-0f57f731ea2a540a4c82b476054e8a36aebb2314.tar.xz |
Merge branch 'pw/sequencer-in-process-commit'
The sequencer infrastructure is shared across "git cherry-pick",
"git rebase -i", etc., and has always spawned "git commit" when it
needs to create a commit. It has been taught to do so internally,
when able, by reusing the codepath "git commit" itself uses, which
gives performance boost for a few tens of percents in some sample
scenarios.
* pw/sequencer-in-process-commit:
sequencer: run 'prepare-commit-msg' hook
t7505: add tests for cherry-pick and rebase -i/-p
t7505: style fixes
sequencer: assign only free()able strings to gpg_sign
sequencer: improve config handling
t3512/t3513: remove KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1
sequencer: try to commit without forking 'git commit'
sequencer: load commit related config
sequencer: simplify adding Signed-off-by: trailer
commit: move print_commit_summary() to libgit
commit: move post-rewrite code to libgit
Add a function to update HEAD after creating a commit
commit: move empty message checks to libgit
t3404: check intermediate squash messages
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions