GitHub - newren/git at ort-wip · GitHub

Name		Name	Last commit message	Last commit date
.github		.github
Documentation		Documentation
block-sha1		block-sha1
builtin		builtin
ci		ci
compat		compat
contrib		contrib
design-notes		design-notes
ewah		ewah
git-gui		git-gui
gitk-git		gitk-git
gitweb		gitweb
mergetools		mergetools
negotiator		negotiator
perl		perl
po		po
ppc		ppc
rebase-testcase		rebase-testcase
refs		refs
sha1collisiondetection @ 855827c		sha1collisiondetection @ 855827c
sha1dc		sha1dc
sha256		sha256
t		t
templates		templates
todos		todos
trace2		trace2
vcs-svn		vcs-svn
xdiff		xdiff
.cirrus.yml		.cirrus.yml
.clang-format		.clang-format
.editorconfig		.editorconfig
.gitattributes		.gitattributes
.gitignore		.gitignore
.gitmodules		.gitmodules
.mailmap		.mailmap
.travis.yml		.travis.yml
.tsan-suppressions		.tsan-suppressions
CODE_OF_CONDUCT.md		CODE_OF_CONDUCT.md
COPYING		COPYING
GIT-VERSION-GEN		GIT-VERSION-GEN
INSTALL		INSTALL
LGPL-2.1		LGPL-2.1
Makefile		Makefile
README.md		README.md
RelNotes		RelNotes
abspath.c		abspath.c
aclocal.m4		aclocal.m4
add-interactive.c		add-interactive.c
add-interactive.h		add-interactive.h
add-patch.c		add-patch.c
advice.c		advice.c
advice.h		advice.h
alias.c		alias.c
alias.h		alias.h
alloc.c		alloc.c
alloc.h		alloc.h
apply.c		apply.c
apply.h		apply.h
archive-tar.c		archive-tar.c
archive-zip.c		archive-zip.c
archive.c		archive.c
archive.h		archive.h
attr.c		attr.c
attr.h		attr.h
banned.h		banned.h
base85.c		base85.c
bisect.c		bisect.c
bisect.h		bisect.h
blame.c		blame.c
blame.h		blame.h
blob.c		blob.c
blob.h		blob.h
bloom.c		bloom.c
bloom.h		bloom.h
branch.c		branch.c
branch.h		branch.h
builtin.h		builtin.h
bulk-checkin.c		bulk-checkin.c
bulk-checkin.h		bulk-checkin.h
bundle.c		bundle.c
bundle.h		bundle.h
cache-tree.c		cache-tree.c
cache-tree.h		cache-tree.h
cache.h		cache.h
chdir-notify.c		chdir-notify.c
chdir-notify.h		chdir-notify.h
check-builtins.sh		check-builtins.sh
check_bindir		check_bindir
checkout.c		checkout.c
checkout.h		checkout.h
color.c		color.c
color.h		color.h
column.c		column.c
column.h		column.h
combine-diff.c		combine-diff.c
command-list.txt		command-list.txt
commit-graph.c		commit-graph.c
commit-graph.h		commit-graph.h
commit-reach.c		commit-reach.c
commit-reach.h		commit-reach.h

Repository files navigation

$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git $ cd linux-stable $ git checkout -b v5.4-renames v5.4.0 $ git mv drivers pilots $ git commit -m "Rename drivers -> pilots" $ git branch -f hwmon-updates fd8bdb23b91876ac1e624337bb88dc1dcc21d67e $ git rev-list --count 4703d9119972bf586d2cca76ec6438f819ffa30e..hwmon-updates

With an "old" version of git (e.g. git-2.25.0):

$ git config merge.directoryRenames true $ time git -c merge.renameLimit=30000 rebase -m --onto HEAD 4703d9119972bf586d2cca76ec6438f819ffa30e hwmon-updates

Now build the new version of git from this branch and compare: $ git checkout v5.4-renames $ git branch -f hwmon-updates fd8bdb23b91876ac1e624337bb88dc1dcc21d67e $ time git fast-rebase --onto HEAD 4703d9119972bf586d2cca76ec6438f819ffa30e hwmon-updates

You can see slides explaining the changes at: https://github.com/newren/presentations/blob/pdfs/merge-performance/merge-performance-slides.pdf

About

Git Source Code Mirror - This is a publish-only repository and all pull requests are ignored. Please follow Documentation/SubmittingPatches procedure for any of your improvements.

Code of conduct

5 stars

3 watching

Report repository

Releases

Packages

Contributors

Languages