mathieu/config
1
1
Fork 0
Code Issues Pull Requests Releases Activity

[git]rebase with autostash + helper to remove dir

Browse Source
This commit is contained in:
Mathieu Maret 2024-10-30 14:42:34 +01:00
parent 49e5d43111
commit 8fa5b4888b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitconfig
View File

@ -78,11 +78,14 @@
blamef = blame -w -C -C -C blamef = blame -w -C -C -C
# Show the log having the modificatoin for $1 # Show the log having the modificatoin for $1
search =!sh -c "git log -S $1 -p" search =!sh -c "git log -S $1 -p"
# remove a folder from history
rmdirfromhistory=!sh -c "git-filter-repo --path $1 --invert-paths"
[rebase] [rebase]
# when rebasing, update the other common branch too. # when rebasing, update the other common branch too.
# See https://andrewlock.net/working-with-stacked-branches-in-git-is-easier-with-update-refs/ # See https://andrewlock.net/working-with-stacked-branches-in-git-is-easier-with-update-refs/
# Need git 2.38 # Need git 2.38
updateRefs = true updateRefs = true
autoStash = true
[branch] [branch]
sort = -committerdate sort = -committerdate
#New branch track remote #New branch track remote
@ -133,7 +136,7 @@
# tool = vimdiff # tool = vimdiff
# conflictstyle = diff3 # conflictstyle = diff3
[push] [push]
default = current #push to upstreal assuming same name for the upstream and current branch default = current #push to upstream assuming same name for the upstream and current branch
#default = upstream # pushed to the configuer upstream branch #default = upstream # pushed to the configuer upstream branch
[credential] [credential]
helper = cache --timeout=3600 helper = cache --timeout=3600
@ -174,5 +177,5 @@
# start maintenance on a repo with git maintenance start # start maintenance on a repo with git maintenance start
#repo = /home/mmaret/Sources/matos #repo = /home/mmaret/Sources/matos
[fetch] [fetch]
#For large repo. Update the commit crash at each commit to have git log --graph super fast #For large repo. Update the commit graph at each commit to have git log --graph super fast
#writeCommitGraph = true #writeCommitGraph = true