GIT CHEAT SHEET. CONFIG --global => write to ~/.gitconfig, otherwise to.git/config. git config [--global] -l git config [--global] -e

Transcription

1 A DIFF GET DISPLAY INFOS / INSPECTION / COMPARISON LIST WORK WH GUI LOG LOG HISTORIC STATUS ADD TRACK GET / CREATION CLONE INIT V1.2 esnault.jerome@gmail.com SET / UNSET git config [--global] section.item value git config [--global] (--unset --unset-all) name [value_regex] git stash show [stash@{numstash }] git stash list git reflog git status GIT CHEAT SHEET CONFIG --global => write to ~/.gitconfig, otherwise to.git/config LIST / EDIT git config [--global] -l git config [--global] -e MERGE TOOL git config --global merge.tool meld DIFF TOOL ALIASES git config --global diff.tool meld git config --global alias.st status echo "meld $2 $5" >> ~/wrapperdifffile git config --global mergetool.prompt false git config --global alias.ci commit git config --global diff.external ~/wrapperdifffile git config --global alias.co checkout git config --global difftool.prompt false FILE FORMAT git config --global alias.br branch git config --global core.autocrlf <bool> git config --global alias.svnpull svn rebase git config --global core.editor "your favorite editor " git config --global alias.svnpush svn dcommit COMPLETION / PROMPT (.bashrc) source ~/.git-completion.bash export GIT_PS1_SHOWDIRTYSTATE=1 GIT_PS1_SHOWSTASHSTATE=1 GIT_PS1_SHOWUNTRACKEDFILES=1 export PS1='\u@\H:\w$( git_ps1 " (%s) ")$ ' STASH WORKING DIR GIT INDEX LOCAL REPO UPSTREAM REPO can custom the --format, -- graph opposed of --date-order get no-merge commits from a guy matching a msg pattern log for submodule commits count / user with looks for regexp in pathpattern -n to print ligne; -c to count ligne --name-only to list files matching from index git init [directory] git svn init ( [-T <trunk> ] [-t <tag> ] [-b <branch>] -s ) <reposvn> git clone [--mirror] <repo> git clone [-o <remotename> ] [-b <BranchName> ] <repo > [<directory> ] git clone [--depth <RevisionNum> ] [--recursive] <repo> [<directory>] update all submodules git svn clone <reposvn> git svn clone ( [-T <trunkdir>] [-t <tagdir>] [-b <branchdir>] -s ) [-r <RevisionNum> ] <reposvn> git remote add [-t <branchonlytracked> ] [-f] <remotename> <URL> git submodule add [-b <frombranch> ] <submodulerepo> [<path> ] git submodule status [--cached] [--recursive] git remote -v show <name> git svn info [--url] git log <sincecommit>..<untilcommit> [[--] <path>...] git log --since="2 weeks ago" git log --format=(short medium full fuller raw) --graph git log --oneline --decorate[=short full] --date-order -<commitnum> git log --author=name --grep=patternmsg [--merges --no-merges] git log <branchename> --not --remotes=*/branchename [<path>] git log --diff-filter=[acdmrtuxb*] [[--] <path>...] git submodule summary [--cached --files] [-n <summarylimit>] git svn log [--oneline] [-r <revisionnum> ] [--show-commit] gitk [-n <number> ] [--all] [--since=<date> ] [--until=<date> ] [<revs> ] [--] [<path> ] giggle git blame [-L <start>,<end> ] [-C] [-n] [--since="3 weeks ago" ] [--] <filepath> git svn blame [--git-fromat] <filepath> git shortlog -nse git show <gitobject> git show <branchname> ~<fromncommit> :<filepath> git svn show-ignore git branch -v git tag git branch -v [-r] [-a] git submodule foreach --recursive 'echo $name $path $sha1 $toplevel' git-var [ -l <variable> ] git grep <regexp1> -n [-c] [--name-only] [<pathpattern>] git grep <regexp1> -n [-c] [--name-only] [<pathpattern>] [<tree>] git svn find-rev r<svnrevnum> git diff [--cached] [<commit>] [--] [<path>] git diff <branchname1> <branchname2> git diff -S<stringPattern> --pickaxe-all HEAD~10..HEAD git whatchanged global local show all user git command line historic from index USER git config --global user.name "Your Name Comes Here " git config --global user. "you@domain.com " IGNORING FILES echo "filepatterntoignore" >> ~/.gitignore git config --global core.excludesfile ~/.gitignore echo "filepatterntoignore" >>.gitignore fetch immediatly git init --bare [directory.git] git svn init [-s] <reposvn> <date> : yesterday 1 year ago 3 mounth ago 1/20/09 works with: --after --until --before print N commits from HEAD, with 1 commit by line, showing refnames, sorting by date what we have that the remote doesn't which commit Add, Copy, Del, Modif, Rename, Changed, Unmerged, (X)unknow, Broken -L specify the range (ligne number or regex) of the file -C detect lines copied or moved from the file to another -n show the line number both remote-tracking branches and local branches Prints a git logical variable : -l to list available var search changes on stringpattern from 10 commits behind HEAD and show all changes if found something

2 TAG PUBLICATION CANCELATION FROM FROM LOCAL MERGE - RECOMPOSE BRANCH / MERGE PURGE CREATION MANIPULATION / SNAPSHOT COMPRES PATCH UPDATE GET FULL GET BY recursive git merge [--no-commit] [--squash] [-m <msg>] <commit remotename> git merge -s [resolve octopus ours recursive(-x ours theirs)] <commit> git add <path> git add -i from index (keep tracking, so restore <path> from index to the working dir) git rm [-r] [--cached] [--] <path>... git mv <src> <dest> git fetch -v [<reponame> ] git svn fetch [-r <revnum>] git pull [--no-commit] [--squash] [--rebase] <reponame> <branchname> git pull [-s [resolve octopus ours recursive (-X ours theirs)] ] <reponame> <branchname> git submodule update [--init] [--rebase] git svn rebase git submodule init git submodule sync git checkout [--] <paths> git submodule foreach '<shellcommand>' update the info in.git/config from.gitmodules return to the file-dir state from local repo git format-patch -C -o <destdir> [-<nbpatches> ] [<sincerev>..<untilrev> ] [<commit>] Detect / renames git send- --from <@> --to <@> [--cc <@>] [--subject <title> ] [--compose] <dir file(*.patch)> Generate patches for all origin git stash [save --[[no-]keep-index] ] git stash pop [stash@{numstash}] git stash apply [stash@{numstash}] git stash drop [stash@{numstash}] git stash clear switch to remote branch switch to local branch switch to new local branch start new local branch tracking the remote one git diff -p origin > file.patch git diff <objectfrom> <objectto> <filepath> > file.patch git remote rename <old> <new> git remote rm <name> git gc [--prune=<date> --no-prune] git repack -d git archive --format=zip -o <outputfile> [--prefix=<prefix>/] <treeh> [<path>] git clean -d [-f] [-n] [-e <patterntonotclean> ] [-x -X] [--] <path> git checkout [-t] <remotename> /<BranchName> git checkout [<branch>] git checkout -b <new_branch> <start_point> git branch -t <branchname> [<startpoint>] git checkout -B <branch> reset the branch remove only tracking git branch -d -r <branchname>... git prune -v [-n] [--] [<branch>...] git branch -m [<oldbranch>] <newbranch> git svn branch -m "msg" git merge <branchname>... git merge --abort git mergetool git rebase [-i] <branch> git rebase (--continue --skip --abort) git rebase [--onto <newbase>] <upstream> [<branch>] git commit -m "<msg> " git citool git commit --interactive git commit -am "<msg>" git remote prune [-n] [--] <remotename> git push <remotename> --delete <branchname> for unmerged path git commit --amend edit previous commit message git checkout [--ours --theirs -m] [<tree-ish>] [--] <paths>.. git-reset --soft [<commit-ish>] git-reset --mixed [<commit-ish>] commit to be pointed now git-reset --hard [<commit-ish>] git rebase -i <commit> git rebase (--continue --skip --abort) git revert [-m <parentnumber> ] [--no-commit] <commit> Generate a patche for filepath between 2 optimize (compressed, remove unless objects).git/ compress.git/ store current unstaged modifications to new stash (git reset --hard is called after, so keep-index option can be used) restore current unstaged modifications restore current unstaged modifications + keep in stash remove from stash without apply it remove all the stash without apply it to see effect without apply don't use ignore rules remove only ignored files remove untracked files/dirs(with -d) create new local branch based on remote one and switch to it remove remain branch (-n to see effect without apply recompose historic the current branch interactively from <branchname> commit to revert : create a new commit above it applying the inverse diff GUI interactive mode git-cherry-pick [--edit] [---replay] [--no-commit] <commit> git apply --check [<patch>...] see effect without apply it git am [-i] [--skip --continue --abort] <Maildir> add remote tracking git push [-n] [-u] [<remote>] [<branch>] git push [-f] [<remote>] [+<srclocalbranch>:<destremotebranch> git svn dcommit -m "msg" git svn tag git tag <tagname> [commit] after rewriting history git tag -d <tagname> git tag -a <tagname> -m "<message> " [commit] V1.2 esnault.jerome@gmail.com

3

4

5 >]