From 8fa5b4888bdb84e6adace04946f6a6ea9a88d49d Mon Sep 17 00:00:00 2001 From: Mathieu Maret Date: Wed, 30 Oct 2024 14:42:34 +0100 Subject: [PATCH] [git]rebase with autostash + helper to remove dir --- .gitconfig | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitconfig b/.gitconfig index 5369ec8..38e1f0b 100644 --- a/.gitconfig +++ b/.gitconfig @@ -78,11 +78,14 @@ blamef = blame -w -C -C -C # Show the log having the modificatoin for $1 search =!sh -c "git log -S $1 -p" +# remove a folder from history + rmdirfromhistory=!sh -c "git-filter-repo --path $1 --invert-paths" [rebase] # when rebasing, update the other common branch too. # See https://andrewlock.net/working-with-stacked-branches-in-git-is-easier-with-update-refs/ # Need git 2.38 updateRefs = true + autoStash = true [branch] sort = -committerdate #New branch track remote @@ -133,7 +136,7 @@ # tool = vimdiff # conflictstyle = diff3 [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 [credential] helper = cache --timeout=3600 @@ -174,5 +177,5 @@ # start maintenance on a repo with git maintenance start #repo = /home/mmaret/Sources/matos [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