X-Git-Url: https://git.xandkar.net/?p=git-cheat-sheet.git;a=blobdiff_plain;f=README.md;h=37c1ae433d66c5067fbca16c14eafcf7adfc727c;hp=3dbce00338f4f05879d30dcba712e7f87206389e;hb=0c3f98d931578bf044f1facc2fb8f3c8a2fb251c;hpb=fe79085123faf9e524caa33bf00f0024b6589960 diff --git a/README.md b/README.md index 3dbce00..37c1ae4 100644 --- a/README.md +++ b/README.md @@ -52,3 +52,40 @@ 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`.