appwiki:git

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Next revision		 Previous revision
appwiki:git [2024/04/11 06:59] – [Command Git cmds] yingappwiki:git [2024/05/08 06:01] (current) – [Git tool] ying
Line 4: Line 4:
     * https://git-scm.com/download/win     * https://git-scm.com/download/win
     * you can download the portable version without mess up your own current system config     * you can download the portable version without mess up your own current system config
 +
 +====== Git tool ======
 +
 +  * git desktop from github
 +    * https://desktop.github.com/
 +  * other
 +    * https://www.gitkraken.com/
 +    * https://www.sourcetreeapp.com/
 +    * https://www.sublimemerge.com/
 +  * vs code related
 +    * https://marketplace.visualstudio.com/items?itemName=mhutchie.git-graph
 +      * view graph tree and difference in commits 
 +    * https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens
 +      * (visual view not free) gitLens — Git supercharged (from gitkraken)
 +
  
 ====== Command Git cmds ====== ====== Command Git cmds ======
  
 +The Three States of Git
 +  * **Modified**: A file is modified when you have changed it but have not yet committed it to your repository. It is only changed in your working directory.
 +  * **Staged**: A modified file becomes staged when you **add it** to your staging area. Here, Git has it marked as ready to be committed in the next snapshot. This means you've told Git to include the updates from this file in the upcoming commit.
 +  * **Committed**: Once a file is committed, it means that the data is safely stored in your repository's local database. This updates the commit history with a new snapshot of your project at the time you made the commit.
 +
 +Cmds
   * start the git-cmd.exe and now you are in a cmd with git built-in, or add git path to your cmd session: <code>set PATH=D:\path_to_git_folder\bin;%PATH%</code>   * start the git-cmd.exe and now you are in a cmd with git built-in, or add git path to your cmd session: <code>set PATH=D:\path_to_git_folder\bin;%PATH%</code>
   * create a default user if you have not <code dos>   * create a default user if you have not <code dos>
Line 41: Line 62:
 git archive --format=zip -o project_code.zip HEAD project_code git archive --format=zip -o project_code.zip HEAD project_code
 </code> </code>
 +  * git download a project: cd to root of your project folders, (note: clone will create root folder of the git project, best no space, AnBn style naming) <code dos> 
 +git clone https://proj_url/project.git 
 +</code> 
 +  * git remote source for fetch and push, (this only deal with remote repo), check remote source <code dos> 
 +git remote -v 
 +</code> 
 +  * git list branch,  
 +    * both local and remote branch<code dos>git branch -a</code> 
 +    * both local branch<code dos>git branch</code> 
 +  * git check all changes to files in detail, this is before changes added (not yet commit) <code dos>git diff</code> 
 +  * always get source update before push <code dos>git pull origin branch-name 
 +git push origin branch-name 
 +</code> 
 +  * create branch for a feature or a issue <code dos>git branch export-feature</code> 
 +  * switch branch <code dos>git checkout export-feature</code> 
 +  * push to remote repo <code dos>git push -u origin export-feature</code> 
 +  * merge a feature branch into main <code dos>git checkout main 
 +git merge export-feature 
 +</code> 
 +  * to check which feature branch has been merged into main before, checkout to main, then <code dos>git branch --merge</code> 
 +    * to check which feature branch has NOT been merged into main, <code dos>git branch --no-merged</code> 
 +    * for already merged branch shows in --merge cmd, you can safely delete those feature branch, as they are already part of main.
 Extra Tips: Extra Tips:
-  * you can use vscode to open the folder project (the one with .git hidden folder), vscode will auto know it is a git project and it has some built-in tool to help you instead of using the git cmd+  * you can use vscode to open the folder project (the one with .git hidden folder), vscode will auto know it is a git project and it has some built-in tool to help you instead of using the git cmd <code dos>git branch -d export-feature</code>
     * you may need to set git.exe path if you use above portable one,     * you may need to set git.exe path if you use above portable one,
     * go File > Preference > setting , search git path, click edit setting.json, it will pop up the {} dictionary part for you to edit <code>"git.path": "D:\\App_Dev\\PortableGit\\bin\\git.exe",</code>     * go File > Preference > setting , search git path, click edit setting.json, it will pop up the {} dictionary part for you to edit <code>"git.path": "D:\\App_Dev\\PortableGit\\bin\\git.exe",</code>
   * if you want more help, you can use Github Desktop app, which you dont have to use their github service, you can use add your local disk project folder, you can manage all the git cmd in a visual way, like compare difference and make commit   * if you want more help, you can use Github Desktop app, which you dont have to use their github service, you can use add your local disk project folder, you can manage all the git cmd in a visual way, like compare difference and make commit
  • appwiki/git.1712818750.txt.gz
  • Last modified: 2024/04/11 06:59
  • by ying