A collection of my scripts and dot files.
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 
Daniel Rode 6cd6faf781
Initial commit after repo sanitization (for public hosting)
6 months ago
bin Initial commit after repo sanitization (for public hosting) 6 months ago
cfg Initial commit after repo sanitization (for public hosting) 6 months ago
sbin Initial commit after repo sanitization (for public hosting) 6 months ago
src Initial commit after repo sanitization (for public hosting) 6 months ago
.gitignore Initial commit after repo sanitization (for public hosting) 6 months ago
readme.txt Initial commit after repo sanitization (for public hosting) 6 months ago

readme.txt


# Git: Procuring Changes From Remote

cd ~/code/
git checkout BRANCH # optional
git status # make sure local changes are comitted locally
git fetch REMOTE
git merge REMOTE/BRANCH -m MESSAGE


# Git: Cleaning up all the temporary cursory commits

git reset --soft COMMIT_ID
git add .
git commit -m 'tmp'

This will uncommit all of the changes commited since the commit made before COMMIT_ID and then commit the current state of your working directory (which is the state it was in since the last cursory commit) as one singular commit.

COMMIT_ID is the commit *just before* the oldest one you want to uncommit. Commit IDs can be found in the git log.