linux
Differences
This shows you the differences between two versions of the page.
| Both sides previous revisionPrevious revisionNext revision | Previous revision | ||
| linux [2023/10/28 12:21] – jotasandoku | linux [2025/10/25 14:23] (current) – jotasandoku | ||
|---|---|---|---|
| Line 33: | Line 33: | ||
| note that tar by itself just packetize not compress. We need flags as z compress. ALSO, tar is oriented ro ' | note that tar by itself just packetize not compress. We need flags as z compress. ALSO, tar is oriented ro ' | ||
| - | tar -cvf vmx.tar / | + | tar -czfv vmx.tar.gz / |
| + | tar -xzvf ansiblepi.tar.gz | ||
| tar -xvf docs.tar # to extract it, folder tree same but from the point we are | tar -xvf docs.tar # to extract it, folder tree same but from the point we are | ||
| tar -xvf cvd.tar.gz * | tar -xvf cvd.tar.gz * | ||
| Line 536: | Line 537: | ||
| git diff origin/ | git diff origin/ | ||
| # Choose to merge or rebase (I prefer rebase) | # Choose to merge or rebase (I prefer rebase) | ||
| - | git rebase | + | |
| + | | ||
| + | ! The above, rebases ‘feature’ into main. But IMPORTANT, I am still in feature and need to merge it: | ||
| + | git checkout main | ||
| + | git merge feature | ||
| | | ||
| # And if either I or somebody else makes a commit that breaks something: | # And if either I or somebody else makes a commit that breaks something: | ||
linux.1698495679.txt.gz · Last modified: (external edit) · Currently locked by: 216.73.216.48
Page Tools
Except where otherwise noted, content on this wiki is licensed under the following license: CC Attribution-Share Alike 4.0 International
