X-Git-Url: https://git.xandkar.net/?p=git-cheat-sheet.git;a=blobdiff_plain;f=README.md;h=37c1ae433d66c5067fbca16c14eafcf7adfc727c;hp=2e13e3d3d795359f3c1521f4766af6b8c20af894;hb=0c3f98d931578bf044f1facc2fb8f3c8a2fb251c;hpb=3fd4f97336fb90332b450544ccb8249c029e26ca diff --git a/README.md b/README.md index 2e13e3d..37c1ae4 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,9 @@ How to do stuff with git Splitting a repo ---------------- -### Remove history of all but select files in cloned repo +##### Remove history of all but select files in cloned repo ```sh -$ cp -Rp old new +$ git clone old new $ cd new $ git clean -dfx $ git gc --aggressive --prune=now @@ -27,7 +27,7 @@ $ git filter-branch \ $ git gc --aggressive --prune=now ``` -### Remove history of previously-removed (not in current tree) files +##### Remove history of previously-removed (not in current tree) files ```sh $ git log --pretty=format: --name-status \ | awk '$0 != "" {print $2}' \ @@ -41,3 +41,51 @@ $ git filter-branch \ ' \ HEAD ``` + + +Inserting a new root commit +--------------------------- +```sh +git checkout --orphan $TEMP_BRANCH +git rm -rf . +git commit --allow-empty -m $INIT_COMMIT_MSG +git rebase --onto $TEMP_BRANCH --root $MAIN_BRANCH +git branch -d $TEMP_BRANCH +``` + + +Deleting all tags, locally and remotely +--------------------------------------- +```sh +for tag in `git tag`; +do + git tag -d $tag + git push $REMOTE_NAME :refs/tags/$tag +done +``` + + +Get an older version of a file +------------------------------ + +```sh +git cat-file -p $COMMIT_DIGEST:$FILE_PATH +``` + + +Splitting a commit +------------------ + +From [docs](https://git-scm.com/docs/git-rebase#_splitting_commits): + +- Start an interactive rebase with `git rebase -i ^`, where `` + is the commit you want to split. +- Mark the commit you want to split with the action "edit". +- When it comes to editing that commit, execute `git reset HEAD^`. The effect + is that the HEAD is rewound by one, and the index follows suit. However, the + working tree stays the same. +- Now add the changes to the index that you want to have in the first commit + (`git add`) +- Commit the now-current index with whatever commit message is appropriate now. +- Repeat the last two steps until your working tree is clean. +- Continue the rebase with `git rebase --continue`.