Getting started with git -- other common commands (config, cherry-pick)

Keywords: git Windows SSL ssh

1. git config (self not verified on organized web)
The git config configuration file used to configure git has three locations corresponding to different overrides.
(1), /etc/gitconfig file:
Include values that apply to all users and libraries of the system.If the parameter option'--system'is passed to git config, it will explicitly read and write the file.(
2).,~/.gitconfig file: specific to your users.
You can make Git read or write this specific file by passing the--global option.
3), config file located in Git directory (that is.git/config):
Whatever library you are currently using, point specifically to that single library.For example, if you are in the first git repository, it is a modification to the current git repository
* without any parameters or when --local
Note: Each level overrides the value of the previous level.Therefore, the value in.git/config will override ~/.git config, which will override in/etc/git config
The same value.When not, go to your superior and use it.
Common configurations:
The first thing you need to do when you install Git is set up your user name and e-mail address.This is important because the letter is used every time a Git submission is made
Info.It is permanently embedded in your submission: 
    

  1.  　　$ git config --global user.name Joey
    2. 

    3. 

  3.  　　$ git config --global user.email  zhaojoeyuan@163.com 
    4.
For current users, when you want to use something special in a warehouse, you just need to set it up again without the--global s.
* See all current settings git config-l often:
    

  1. Administrator@9GPBSPCCTFQXEUX MINGW64 /e/gits/RemoteForTest (master)
    2. 

  2. $ git config -l
    3. 

  3. \core.symlinks=false
    4. 

  4. core.autocrlf=true
    5. 

  5. core.fscache=true
    6. 

  6. color.diff=auto
    7. 

  7. color.status=auto
    8. 

  8. color.branch=auto
    9. 

  9. color.interactive=true
    10. 

  10. help.format=html
    11. 

  11. http.sslcainfo=D:/git/Windows/Git/mingw64/ssl/certs/ca-bundle.crt
    12. 

  12. diff.astextplain.textconv=astextplain
    13. 

  13. rebase.autosquash=true
    14. 

  14. user.name=Joey
    15. 

  15. user.email=zhaojoeyuan@163.com
    16. 

  16. push.default=simple
    17. 

  17. core.editor=vi
    18. 

  18. core.repositoryformatversion=0
    19. 

  19. core.filemode=false
    20. 

  20. core.bare=false
    21. 

  21. core.logallrefupdates=true
    22. 

  22. ......
    23.
There are also more common attributes such as:
--system, --global, --local--local: is the default.
     git config [--global] options  value
core.editor=gedit: Editor to set default
push.default=simple: used to set the default push mode
--get: used to get
             git config --get core.editor
    

  1. Administrator@9GPBSPCCTFQXEUX MINGW64 /e/gits/RemoteForTest (master)
    2. 

  2. $ git config --get core.editor
    3. 

  3. vi   
    4.
            git config --global --get user.name
    

  1. Administrator@9GPBSPCCTFQXEUX MINGW64 /e/gits/RemoteForTest (master)
    2. 

  2. $ git config --get user.name
    3. 

  3. Joey
    4.
-- unset Delete: git config --unset user.name Delete a configuration

2,git cherry-pick.
Complete command: git cherry-pick [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] [-S[<keyid>] <commit>...
git cherry-pick: Submit commits that have already been submitted again. Can be one or more.
Here I used a non-conflicting command to understand the command and created a new.txt file of my own
    

  1. Administrator@9GPBSPCCTFQXEUX MINGW64 /e/gits/RemoteForTest (master)
    2. 

  2. $ vi new.txt
    3. 

    4. 

  4. Administrator@9GPBSPCCTFQXEUX MINGW64 /e/gits/RemoteForTest (master)
    5. 

  5. $ git status
    6. 

  6. On branch master
    7. 

  7. Your branch is ahead of 'origin/master' by 1 commit.
    8. 

  8.   (use "git push" to publish your local commits)
    9. 

  9. Untracked files:
    10. 

  10.   (use "git add <file>..." to include in what will be committed)
    11. 

    12. 

  12.         new.txt
    13. 

    14. 

  14. nothing added to commit but untracked files present (use "git add" to track)
    15. 

    16. 

  16. Administrator@9GPBSPCCTFQXEUX MINGW64 /e/gits/RemoteForTest (master)
    17. 

  17. $ git add .
    18. 

  18. warning: LF will be replaced by CRLF in new.txt.
    19. 

  19. The file will have its original line endings in your working directory.
    20. 

    21. 

  21. Administrator@9GPBSPCCTFQXEUX MINGW64 /e/gits/RemoteForTest (master)
    22. 

  22. $ git commit
    23. 

  23. [master 52d0d56] Joey :      Test forcherry-pickCommand of     Ha Ha Ha Ha Ha Ha Ha Ha Ha Ha
    24. 

  24. warning: LF will be replaced by CRLF in new.txt.
    25. 

  25. The file will have its original line endings in your working directory.
    26. 

  26.  1 file changed, 1 insertion(+)
    27. 

  27.  create mode 100644 new.txt
    28. 

    

  1. Administrator@9GPBSPCCTFQXEUX MINGW64 /e/gits/RemoteForTest (master)
    2. 

  2. $ git log
    3. 

  3. commit 52d0d56d7a70181672cbf78149f60a50ad93add9
    4. 

  4. Author: Joey <zhaojoeyuan@163.com>
    5. 

  5. Date:   Tue Apr 18 20:38:29 2017 +0800
    6. 

    7. 

  7.     Joey : 
    8. 

  8.         Test forcherry-pickCommand of
    9. 

  9.         Ha Ha Ha Ha Ha Ha Ha Ha Ha Ha
    10. 

    11. 

  11. commit dc67406bf27de952d792cde3f6387d12dcca7544
    12. 

  12. Author: Joey <zhaojoeyuan@163.com>
    13. 

  13. Date:   Mon Apr 17 23:17:10 2017 +0800
    14. 

    15. 

  15.     checkout
    16.
After submitting, we switch to another branch, intending to put the previous submission cherry-pick on.
    

  1. Administrator@9GPBSPCCTFQXEUX MINGW64 /e/gits/RemoteForTest (master)
    2. 

  2. $ git branch
    3. 

  3.   joey/master
    4. 

  4.   local
    5. 

  5. * master
    6. 

  6.   new
    7. 

  7.   next
    8. 

  8.   test
    9. 

    10. 

  10. Administrator@9GPBSPCCTFQXEUX MINGW64 /e/gits/RemoteForTest (master)
    11. 

  11. $ git checkout test
    12. 

  12. Switched to branch 'test'
    13. 

  13. Administrator@9GPBSPCCTFQXEUX MINGW64 /e/gits/RemoteForTest (test)
    14. 

  14. $ ls
    15. 

  15. Test.txt
    16. 

  16. Administrator@9GPBSPCCTFQXEUX MINGW64 /e/gits/RemoteForTest (test)
    17. 

  17. $ git log -2
    18. 

  18. commit e4b44b46e2b55e07ef0b69f440a57ab72f666826
    19. 

  19. Author: zhaoJoeyuan <zhaojoeyuan@163.com>
    20. 

  20. Date:   Mon Apr 17 22:38:52 2017 +0800
    21. 

    22. 

  22.     Update Test.txt
    23. 

    24. 

  24. commit ee244d06b0221853e1711bb453d5bcaada488747
    25. 

  25. Author: zhaoJoeyuan <zhaojoeyuan@163.com>
    26. 

  26. Date:   Mon Apr 17 22:32:24 2017 +0800
    27. 

    28. 

  28.     Update Test.txt
    29. 

    30. 

  30. Administrator@9GPBSPCCTFQXEUX MINGW64 /e/gits/RemoteForTest (test)
    31. 

  31. $ git cherry-pick 52d0d56d7a70181672cbf78149f60a50ad93add9
    32. 

  32. [test 81dcaa7] Joey :      Test forcherry-pickCommand of     Ha Ha Ha Ha Ha Ha Ha Ha Ha Ha
    33. 

  33.  Date: Tue Apr 18 20:38:29 2017 +0800
    34. 

  34.  1 file changed, 1 insertion(+)
    35. 

  35.  create mode 100644 new.txt
    36. 

    37. 

  37. Administrator@9GPBSPCCTFQXEUX MINGW64 /e/gits/RemoteForTest (test)
    38. 

  38. $ ls
    39. 

  39. new.txt  Test.txt
    40.
If you don't know the previously submitted id, use git reflog to view it, here you can see that cherry-pick ing on the master branch succeeded.
Notice that commitid s are different and represent the only submission.You may also need to modify the submitted message information during actual development, so you
) Just use git commit --amend to modify it
    

  1. Administrator@9GPBSPCCTFQXEUX MINGW64 /e/gits/RemoteForTest (test)
    2. 

  2. $ git commit --amend
    3. 

  3. [test 70e1cdb] Joey :      Test forcherry-pickCommand of     Ha Ha Ha Ha Ha Ha Ha Ha Ha Ha     modifymessgaeinformation.
    4. 

  4.  Date: Tue Apr 18 20:38:29 2017 +0800
    5. 

  5.  1 file changed, 1 insertion(+)
    6. 

  6.  create mode 100644 new.txt
    7. 

    8. 

  8. Administrator@9GPBSPCCTFQXEUX MINGW64 /e/gits/RemoteForTest (test)
    9. 

  9. $ git log -2
    10. 

  10. commit 70e1cdb6b8ce366eb004d0e900e1e443089f96b2
    11. 

  11. Author: Joey <zhaojoeyuan@163.com>
    12. 

  12. Date:   Tue Apr 18 20:38:29 2017 +0800
    13. 

    14. 

  14.     Joey : 
    15. 

  15.         Test forcherry-pickCommand of
    16. 

  16.         Ha Ha Ha Ha Ha Ha Ha Ha Ha Ha
    17. 

  17.         modifymessgaeinformation.
    18.
You can also modify the author. Sometimes the current patch isn't you at work, so you need to change it. Note the format of the name.
    

  1. Administrator@9GPBSPCCTFQXEUX MINGW64 /e/gits/RemoteForTest (test)
    2. 

  2. $ git commit --amend --author="zhaoyuan <zy782234027@qq.com>"
    3. 

  3. [test 083f58f] Joey :      Test forcherry-pickCommand of     Ha Ha Ha Ha Ha Ha Ha Ha Ha Ha     modifymessgaeinformation.
    4. 

  4.  Author: zhaoyuan <zy782234027@qq.com>
    5. 

  5.  Date: Tue Apr 18 20:38:29 2017 +0800
    6. 

  6.  1 file changed, 1 insertion(+)
    7. 

  7.  create mode 100644 new.txt
    8. 

    9. 

  9. Administrator@9GPBSPCCTFQXEUX MINGW64 /e/gits/RemoteForTest (test)
    10. 

  10. $ git log -2
    11. 

  11. commit 083f58fd2cce4310d041f575d9c80cb20511923a
    12. 

  12. Author: zhaoyuan <zy782234027@qq.com>
    13. 

  13. Date:   Tue Apr 18 20:38:29 2017 +0800
    14. 

    15. 

  15.     Joey : 
    16. 

  16.         Test forcherry-pickCommand of
    17. 

  17.         Ha Ha Ha Ha Ha Ha Ha Ha Ha Ha
    18. 

  18.         modifymessgaeinformation.
    19.
You can submit this push to a remote repository or gerrite once everything has been met.Resolve conflicts as usual when there are conflicts
You can.When a cherry-pick is executed, a new submission is generated.Git commit-c id: ID is cherry-pick ID.
git cherry-pick-x <commit id>: This cherry pick retains information about the original submitter, such as the original author.But don't know if commiter stays the same?
Be careful when you are actually working.
         git fetch ssh://xp022430@review.sonyericsson.net:29418/platform/packages/apps/Nfc refs/changes/13/1788013/1 && 
git cherry-pick FETCH_HEAD: The command for cherry-pick copied from gerrite is as follows: fetch first, then submit fetch remotely
ID, cherr-pick to local.Then you see for yourself that you don't need to modify message information, author, and so on.Change it yourself.

Posted by HGeneAnthony on Sat, 06 Jul 2019 10:05:10 -0700

Hot Keywords

©2024 Programmer Group