Git: Difference between revisions

From Chorke Wiki
Jump to navigation Jump to search
No edit summary
No edit summary
Line 1: Line 1:
{|
{|
| valign="top" |
| valign="top" |
  git stash push -m 'stash_v1.0.00'
  git stash push -m stash_v1.0.00
git stash apply stash^{/stash_v1.0.00}
  git stash apply stash@{0}
  git stash apply stash@{0}
  git stash pop stash@{0}  
  git stash pop stash@{0}  
Line 9: Line 10:
  git diff > ~/.chorke/tmp/academia/patch/v1.0.00.patch
  git diff > ~/.chorke/tmp/academia/patch/v1.0.00.patch
  git apply  ~/.chorke/tmp/academia/patch/v1.0.00.patch
  git apply  ~/.chorke/tmp/academia/patch/v1.0.00.patch
git apply --3way ~/.chorke/tmp/academia/patch/v1.0.00.patch
   
   
   
   

Revision as of 04:41, 23 June 2021

git stash push -m stash_v1.0.00
git stash apply stash^{/stash_v1.0.00}
git stash apply stash@{0}
git stash pop stash@{0} 
git stash list
git diff > ~/.chorke/tmp/academia/patch/v1.0.00.patch
git apply  ~/.chorke/tmp/academia/patch/v1.0.00.patch
git apply --3way ~/.chorke/tmp/academia/patch/v1.0.00.patch


Git Tag

annotated tag
git tag -a v1.5_initial_setup -m 'initial setup'
git tag -a v1.5_initial_setup
lightweight tag
git tag    v1.5_initial_setup

References