Search This Blog

2017-11-30

git-cheat-sheet revised

#file: git-cheat-sheet.sh

# who has done what in the current branch
git log --format='%h %ai %an %m%m %s'

# get the commit from which you wanto to change the history 
last_own_commit_hash=babba7c

# start eding the history
git rebase -i $last_own_commit_hash
# on the first opening of the file change ONLY the picks -> squash or whatever
# on the second opening of the commit msg file change the commit msg to add

# how-to remove a file added accidentally from the whole history
git filter-branch --tree-filter 'rm -f passwords.txt' HEAD

# how-to remove all the files from staging
git reset HEAD -- .

# who has done what in the current branch
git log --format='%h %ai %an %m%m %s'

# how-to list which files were added to the 6804322 commit
git diff-tree --no-commit-id --name-only -r 6804322

# who has done what on a specific file
git log --format='%h %ai %an %m%m %s' --follow some/file

# how-to check all the current branches with less in colors
git branch -a --color=always | less -r

# how-to remove deleted files from git
git ls-files --deleted -z | xargs -0 git rm

#how-to delete a remote branch 
git push --force remote_name :branch_to_delete
git push origin --delete feature/feature_to_delete

# compare the a tmp branch and the master branch
git log --graph --decorate --pretty=oneline --abbrev-commit master origin/master tmp

# how-to reset the local repo branch to be just like the remote one
# you could skip those 2 lines if you do not want to save your local changes
git commit -a -m "Saving my work, just in case"
git branch my-saved-work

# overwrite you local master with the remote one - or another branch ... 
git fetch origin
git reset --hard origin/master

# how-to compare the same file contents in the 
git diff mybranch master -- path/to/file

git fetch --all
git fetch -p origin

# push my cool feature to  my repo fork
git push myrepofork feature/mycoolfeature

#how-to delete a branch locally and remotely
git branch -D branch_to_delete
git push -d origin branch_to_delete

# how-to list your existing tags
git tag
git push origin tag_name


# how-to tag a version 
export msg="a simple scala console project"
export version='v0.9.0.1'
export tag_msg=" $version -- "`date "+%Y-%m-%d %H:%M:%S"`" -- $msg"
git tag -a $version -m "$tag_msg"
#how-to check a version 
git show $version


# to check a specific commit 
git show $git_obj
# howo show which files have been commited 
git diff-tree --no-commit-id --name-only -r $git_obj


# how-to check all the branches 
git branch -a

# chekout as specific branch
git fetch --all
git checkout feature/feature_name

# how-to delete local branches deleted already on the remote
git fetch -p --all



git checkout develop -- `git ls-tree --name-only -r develop | egrep '*.zip'`

# how-to compare 2 brancches 
git diff branch1 branch2

git log
# git status in colors
git -c color.status=always status | less -REX

# before rebasing 
git pull --rebase

# remove the unneeded commits from the last 10 
git rebase -i HEAD~10




# how-to apply a commit from specific branch to the current branch
git cherry-pick $commit_sha_to_apply


# list all the remote branches
git branch --all 
git branch --remotes




#how-to install git on Ubuntu, RH and cygwin
apt-get install -y git
yum install -y git
setup-x86_64.exe -q -s http://cygwin.mirror.constant.com -P "inetutils,wget,open-ssh,curl,grep,egrep,git"

# pretend starting from different directory 
git -C ..
alias git="git -C $dir"


# to to the tmp dir 
cd /tmp 

# set a pw run-time store in the cache 
git config --global credential.helper cache
git config --global core.editor "vim"
git config credential.helper 'cache --timeout=3600'
# configure the user name and e-mail for git 
git config --global user.name "YordanGeorgiev"
git config --global user.email "yordan.georgiev@gmail.com"
# configure push behaviour
git config --global push.default simple

# and verify
less ~/.gitconfig

# generate your ssh keys to authenticate yourself against github
ssh-keygen -t ecdsa -b 521
# paste the output as new key into the https://github.com/settings/keys section
cat ~/.ssh/id_ecdsa.pub





# add the remote 
# this one asks usually a pw
git remote add origin https://github.com/YordanGeorgiev/isg-pub.git

# this one does not ask for pw if you have ssh keys set up in github
git remote set-url origin git+ssh://git@github.com/YordanGeorgiev/aspark-starter

# initialize a new git repo
git init
# clone the existing repo from the Internet
git clone https://github.com/YordanGeorgiev/isg-pub.git
# move the .git dir to the 

# ups something went rong should redo 
git rm --cached -r .

# add the product version dir 
git add -v --all isg-pub.0.8.9.dev.ysg
# force remote repo rebuild 
git push --force -u origin master
git push -u origin master



# initialize
git init
# add remote origin
git remote add origin https://github.com/YordanGeorgiev/isg-pub.git
https://github.com/YordanGeorgiev/nzbackup-runner.git
# verify
git remote -v
git config --global user.name "YordanGeorgiev"
git config --global user.email "yordan.georgiev@gmail.com"

# make git remember your pass 
git config --global credential.helper cache
git config credential.helper 'cache --timeout=3600'
# stop make git remember your pass 

# get help 
# git --help

# simly add all the files from the current directory
git add --all 
git rm --cached -r <<dir_i_did_not_want_to_add>>

# dry run adding verbose a dir 
git add -v -n --all isg-pub.0.8.9.dev.ysg


#create the master branch 
git push --force -u origin master
git push -u origin master

git commit -m "Adding $component_name $component_version files recursively " 

git push



# to remove all the files
git rm *

# to force master branch re-creation
man git-branch

wget --no-check-certificate https://github.com/$MyGitUserName/nzbackup-runner/archive/master.zip
# how-to clone 
git_repo_url=https://yordan.georgiev@git.aktia.biz/scm/~yordan.georgiev/core-5971.git
git clone "$git_repo_url"

# add the reamde file for the new project 
touch README.md
git add README.md

git pull origin master

# how-to add all the files ( except those matching the $issue/.gitignore ) 
git add --all
git commit -m "vw_INTIME_GL-create-view.sql v1.0.3 - re-write start with GL accounts"
git push origin master


# well this is more of an jira git integration , but anyway 
# how-to link Stash commits to jira issues 
git commit -m "$issue_id 0.4.1 foo bar"

git log --pretty=format:"%cr %cn %s" --author="Georgiev Yordan" -3

# create a srong key for encryption with github
ssh-keygen -t ecdsa -b 521

#how-to highlight a single line by http link from github
# obs the #L<<line-number>>
https://github.com/futurice/lp_calculator_ui/blob/master/app/index.html#L47


# how-to pass a one time config variable to git
git -c color.status=always status | less -REX

# how-to delete all the obsolete feature branches
while read -r f; do git push ygeo :$f ; \
done < <(git branch -a | grep -i 'ygeo/feature' | grep -v 'kiky'| \
perl -nl -e 's/remotes\/ygeo\///g;print')

alias glol='git log --graph --pretty="%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset""
     --abbrev-commit'

# how-to fix the file permissions to the state git thinks they should be
git diff -p \
| grep -E '^(diff|old mode|new mode)' \
| sed -e 's/^old/NEW/;s/^new/old/;s/^NEW/new/' \
| git apply


# check the following resources:
# https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging
# https://gist.github.com/JamesMGreene/cdd0ac49f90c987e45ac



#eof file: git-cheat-sheet.sh

No comments:

Post a Comment

- the first minus - Comments have to be moderated because of the spammers
- the second minus - I am very lazy at moderating comments ... hardly find time ...
- the third minus - Short links are no good for security ...
- The REAL PLUS : Any critic and positive feedback is better than none, so your comments will be published sooner or later !!!!

Labels

perl (41) Cheat Sheet (25) how-to (24) windows (14) sql server 2008 (13) linux (12) oracle (12) sql (12) Unix (11) cmd windows batch (10) mssql (10) cmd (9) script (9) textpad (9) netezza (8) sql server 2005 (8) cygwin (7) meta data mssql (7) metadata (7) bash (6) code generation (6) Informatica (5) cheatsheet (5) energy (5) tsql (5) utilities (5) excel (4) future (4) generic (4) git cheat sheet (4) html (4) perl modules (4) programs (4) settings (4) sh (4) shortcuts (4) поуки (4) принципи (4) Focus Fusion (3) Solaris (3) cool programs (3) development (3) economy (3) example (3) freeware (3) fusion (3) logging (3) morphus (3) mssql 2005 (3) nuclear (3) nz (3) parse (3) python (3) sftp (3) sofware development (3) source (3) sqlplus (3) table (3) vim (3) .Net (2) C# (2) China (2) GUI (2) Google (2) GoogleCL (2) Solaris Unix (2) architecture (2) ascii (2) awk (2) batch (2) cas (2) chrome extensions (2) code2html (2) columns (2) configuration (2) conversion (2) duplicates (2) excel shortcuts (2) export (2) file (2) free programs (2) informatica sql repository (2) linux cheat sheet (2) mssql 2008 (2) mysql (2) next big future (2) nsis (2) nz netezza cheat sheet (2) nzsql (2) ora (2) prediction (2) publish (2) release management (2) report (2) security (2) single-click (2) sqlserver 2005 (2) sqlserver 2008 (2) src (2) ssh (2) template (2) tools (2) vba (2) video (2) xlt (2) xml (2) youtube videos (2) *nix (1) .vimrc (1) .virmrc vim settings configs (1) BSD license (1) Bulgaria (1) Dallas (1) Database role (1) Dense plasma focus (1) Deployment (1) ERP (1) ExcelToHtml (1) GD (1) GDP (1) HP-UX (1) Hosting (1) IDEA (1) INC (1) IT general (1) ITIL management bullshit-management (1) IZarc (1) Java Web Start (1) JavaScript anchor html jquery (1) Khan Academy (1) LINUX UNIX BASH AND CYGWIN TIPS AND TRICKS (1) Linux Unix rpm cpio build install configure (1) Linux git source build .configure make (1) ListBox (1) MIT HYDROGEN VIRUS (1) OO (1) Obama (1) PowerShell (1) Run-time (1) SDL (1) SIWA (1) SOX (1) Scala (1) Services (1) Stacks (1) SubSonic (1) TED (1) abstractions (1) ansible hosts linux bash (1) ansible linux deployment how-to (1) ansible yum pip python (1) apache (1) apache 2.2 (1) application life cycle (1) architecture input output (1) archive (1) arguments (1) avatar (1) aws cheat sheet cli (1) aws cli (1) aws cli amazon cheat sheet (1) aws elb (1) backup (1) bash Linux open-ssh ssh ssh_server ssh_client public-private key authentication (1) bash perl search and replace (1) bash stub (1) bin (1) biofuels (1) biology (1) books (1) browser (1) bubblesort (1) bugs (1) build (1) byte (1) cas_sql_dev (1) chennai (1) chrome (1) class (1) claut (1) cmdow (1) code generation sqlserver (1) command (1) command line (1) conf (1) confluence (1) console (1) convert (1) cool programs windows free freeware (1) copy paste (1) copy-paste (1) csv (1) ctags (1) current local time (1) cygwin X11 port-forwarding mintty xclock Linux Unix X (1) cygwin bash how-to tips_n_tricks (1) cygwin conf how-to (1) data (1) data types (1) db2 cheat sheet (1) db2 starter ibm bash Linux (1) debt (1) diagram (1) dictionaries (1) digital (1) disk (1) disk space (1) documentation (1) dos (1) dubai (1) e-cars (1) electric cars (1) electricity (1) emulate (1) errors (1) exponents (1) export workflow (1) extract (1) fast export (1) fexp (1) file extension (1) file permissions (1) findtag (1) firewall (1) for loop (1) freaky (1) functions (1) fusion research (1) german (1) git gitlab issues handling system (1) google cli (1) google code (1) google command line interface (1) gpg (1) ha (1) head (1) helsinki (1) history (1) hop or flop (1) host-independant (1) how-to Windows cmd time date datetime (1) ibm db2 cognos installation example db deployment provisioning (1) ideas (1) image (1) informatica oracle sql (1) informatica repo sql workflows sessions file source dir (1) informatica source files etl (1) install (1) isg-pub issue-tracker architecture (1) it management best practices (1) java (1) jump to (1) keyboard shortcuts (1) ksh (1) level (1) linkedin (1) linux bash ansible hosts (1) linux bash commands (1) linux bash how-to shell expansion (1) linux bash shell grep xargs (1) linux bash tips and t ricks (1) linux bash unix cygwin cheatsheet (1) linux bash user accounts password (1) linux bash xargs space (1) linux cheat-sheet (1) linux cheatsheet cheat-sheet revised how-to (1) linux how-to non-root vim (1) linux ssh hosts parallel subshell bash oneliner (1) london (1) make (1) me (1) metacolumn (1) metadata functions (1) metaphonre (1) method (1) model (1) movie (1) multithreaded (1) mysql cheat sheet (1) mysql how-to table datatypes (1) n900 (1) nano (1) neteza (1) netezza bash linux nps (1) netezza nps (1) netezza nps nzsql (1) netezza nz Linux bash (1) netezza nz bash linux (1) netezza nz nzsql sql (1) netezza nzsql database db sizes (1) non-password (1) nord pol (1) nps backup nzsql schema (1) number formatting (1) nz db size (1) nz table count rows (1) nzsql date timestamp compare bigint to_date to_char now (1) on-lier (1) one-liners (1) one-to-many (1) oneliners (1) open (1) open source (1) openrowset (1) openssl (1) oracle PL/SQL (1) oracle Perl perl (1) oracle installation usability (1) oracle number formatting format-model ora-sql oracle (1) oracle templates create table (1) oracle trigger generic autoincrement (1) oracle vbox virtual box cheat sheet (1) oracle virtual box cheat sheet (1) outlook (1) parser (1) password (1) paths (1) perl @INC compile-time run-time (1) perl disk usage administration Linux Unix (1) perl modules configuration management (1) permissions (1) php (1) picasa (1) platform (1) postgreSQL how-to (1) powerShell cmd cygwin mintty.exe terminal (1) ppm (1) predictions (1) prices (1) principles (1) productivity (1) project (1) prompt (1) proxy account (1) public private key (1) publishing (1) putty (1) qt (1) read file (1) registry (1) relationship (1) repository (1) rm (1) scala ScalaFmt (1) scp (1) scripts (1) scsi (1) search and replace (1) sed (1) sendEmail (1) sh stub (1) shortcuts Windows sql developer Oracle (1) sidebar (1) silicon (1) smells (1) smtp (1) software development (1) software procurement (1) sofware (1) sort (1) sql script (1) sql_dev (1) sqlcmd (1) sqlite (1) sqlite3 (1) sshd (1) sshd cygwin (1) stackoverflow (1) stored procedure (1) stub (1) stupidity (1) subroutines (1) svn (1) sysinternals (1) system design (1) tail (1) tar (1) temp table (1) templates (1) teradata (1) terminal (1) test (1) testing (1) theory (1) thorium (1) time (1) tip (1) title (1) tmux .tmux.conf configuration (1) tmux efficiency bash (1) tool (1) ui code prototyping tips and tricks (1) umask Linux Unix bash file permissions chmod (1) url (1) urls (1) user (1) utility (1) utils (1) vb (1) vbox virtual box cheat sheet (1) vim perl regex bash search for string (1) vim recursively hacks (1) vim starter (1) vim-cheat-sheet vim cheat-sheet (1) vimeo (1) visual stuio (1) warsaw (1) wiki (1) wikipedia (1) window (1) windows 7 (1) windows 8 (1) windows programs (1) windows reinstall (1) windows utility batch perl space Windows::Clipboard (1) wisdoms (1) workflow (1) worth-reading (1) wrapper (1) xp_cmdshell (1) xslt (1) youtube (1)

Blog Archive

Translate with Google Translate

My Blog List