Difference between revisions of "Git"
Jump to navigation
Jump to search
Line 37: | Line 37: | ||
``` | ``` | ||
for i in $(git diff master...pr -- hosts.txt | grep "^+" | grep -v "^++" | cut -c2-); do echo add $i; done | for i in $(git diff master...pr -- hosts.txt | grep "^+" | grep -v "^++" | cut -c2-); do echo add $i; done | ||
+ | ``` | ||
+ | |||
+ | simple file compare | ||
+ | ``` | ||
+ | for i in $(git diff hosts.cur hosts.new | grep "^+" | grep -v "^++" | cut -c2-); do echo add $i; done | ||
``` | ``` |
Revision as of 12:17, 13 August 2020
Git Common Commands
git reset --soft HEAD~1 # Keep changes git reset --hard HEAD~1 # Discard changes
ref: https://www.git-tower.com/learn/git/faq/undo-last-commit
git clone git@github.com:jeremybusk/myrepo.git git checkout --orphan temp_branc git add -A git commit -m "add files" git branch -D master git branch -m master git push -f origin master
wipe history - you can use git clone as well or just copy files to new repo
Showing Changes
git ls-remote origin
hosts.txt
host1,up host2,up
Show new lines
for i in $(git diff master...pr -- hosts.txt | grep "^+" | grep -v "^++" | cut -c2-); do echo add $i; done
simple file compare
for i in $(git diff hosts.cur hosts.new | grep "^+" | grep -v "^++" | cut -c2-); do echo add $i; done