wiki:manulas/git

Version 14 (modified by tigran, 4 years ago) (diff)

--

  • checkout
git clone git://linux-nfs.org/linux-pnfs.git
  • make you know to git
git config user.name "Tigran Mkrtchyan"
git config user.email "tigran.mkrtchyan@xxx.xxx"

  • checkout/switch to a branch
    git checkout -b my-master origin/master
    
  • commit local changes

git commit -a
  • commit changes and merge it into prevision commit
git commit -a --amend
  • create a patch file from last commit
git format-patch -s -1
  • create a patch file from a given commit
git format-patch -s -1 <sha1>
  • send the patch
git send-email --to pnfs@linux-nfs.org --from <yourself> <filelist from format patch>
  • list remote branches
git branch -r 
  • update tree with remote repository
git remote update
  • update current workspace with repository
git reset --hard origin/pnfs
  • revert current tree up to specified revision
git reset <revision>
  • resolve conflict on stash pop
    git reset HEAD
    

Example:

git-send-email -to bfields@fieldses.org --cc pnfs@linux-nfs.org --from tigran.mkrtchyan@desy.de 
     --subject "Wireshark infinit recursion in dissect_nfs_deviceaddr4" 
     --smtp-server smtp.desy.de 0001-fixed-infinit-recursion-in-decoding-deviceinfo.patch