X-Git-Url: https://git.xandkar.net/?p=git-cheat-sheet.git;a=blobdiff_plain;f=README.md;h=280c99e0329c98850e0cf5762ddabbcdff7f2a2f;hp=7b84acac11fc3609e283d6e89487918947178427;hb=402d8d8e07f5115ea4f953078bdac1c962cc9a44;hpb=4b6ac450277d33471600ae525a126ece4491d97b diff --git a/README.md b/README.md index 7b84aca..280c99e 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,28 @@ git-cheat-sheet How to do stuff with git +Staging a subset of changes in a file +------------------------------------- + + git add -p + + y - stage this hunk + n - do not stage this hunk + q - quit; do not stage this hunk or any of the remaining ones + a - stage this hunk and all later hunks in the file + d - do not stage this hunk or any of the later hunks in the file + g - select a hunk to go to + / - search for a hunk matching the given regex + j - leave this hunk undecided, see next undecided hunk + J - leave this hunk undecided, see next hunk + k - leave this hunk undecided, see previous undecided hunk + K - leave this hunk undecided, see previous hunk + s - split the current hunk into smaller hunks + e - manually edit the current hunk + ? - print help + +https://git-scm.com/docs/git-add#Documentation/git-add.txt-patch + Splitting a repo ---------------- @@ -47,7 +69,7 @@ Inserting a new root commit --------------------------- ```sh git checkout --orphan $TEMP_BRANCH -git rm -rf . +git rm -rf * git commit --allow-empty -m $INIT_COMMIT_MSG git rebase --onto $TEMP_BRANCH --root $MAIN_BRANCH git branch -d $TEMP_BRANCH