How to choose a key used rather than the default ~/.ssh/id_rsa when ssh to a remote server for a specific host? You have at least 2 choices for choosing the key used by ssh. Taking ~/.ssh/key1 and email@example.com as the example here. Method one, specify the key in command line with the -i option of […]
For your first push with git, you may get following errors when you use github or bitbucket. $ git push No refs in common and none specified; doing nothing. Perhaps you should specify a branch such as ‘master’. fatal: The remote end hung up unexpectedly Everything up-to-date Just run following command to set your remote […]
How to get the top committers in git? Like in github: But plain text is fine showing number of commits and author names/emails sorted by the number of commits. You may use this command: git log | grep Author | sort | uniq -c | sort -n -r Here, count the number of commits by […]
How to get the latest git commit SHA-1 id in a repository? And how to get the first 8 digits of the SHA-1? Instead of the method introduced here, you may use $ git rev-parse HEAD to get the commit SHA-1 hash ID. If you want to get the first 8 digits only, use $ […]
When you write your master thesis (in Chinese) on windows, you may have following worries. a, Be afraid your master thesis is lost (or can not be accessed) when hard disk/udisk is broken (or something other viruses). b, Keep master thesis availability (7×24) and safety. c, Do not want anyone else to access it before […]
The result of git by git diff –word-diff is great. But how to do diff like git diff –word-diff without git on Linux? The plain diff command on Linux seems not accept options like –word-diff. The wdiff is for word-diff: wdiff program is a front end to diff for comparing files on a word per […]
How to test whether the git repository is dirty? git status can show this. But how to diagrammatically detect this in bash? This piece of bash code works like a charm for me: [[ $(git diff –shortstat 2> /dev/null | tail -n1) != “” ]] You can use it to build your script. For example, […]
I am looking for a better method for getting the latest commit’s hash in git. I know git log -1 can show the info of the latest commit and from the info of the latest commit I can use grep and other tools to get the hash. Is there better method supported from git? Note: […]
How to merge upstream into local fork repo with git? Merging an upstream repository into your fork: https://help.github.com/articles/merging-an-upstream-repository-into-your-fork/ Merging an upstream repository into your fork: https://help.github.com/articles/merging-an-upstream-repository-into-your-fork/ Answered by harryxiyou.
As is known, git-send-email is easy to send patches to upstreams. However, now, I happen to following questions. How to solve it??? $ sudo git send-email –firstname.lastname@example.org –email@example.com –firstname.lastname@example.org –subject=”[PATCH stable-2.10] Fix typos in doc/design-file-based-storage.rst” –smtp-server=/usr/bin/msmtp ./0001-fix-typos-in-design-file-based-storage.rst-doc.patch ./0001-fix-typos-in-design-file-based-storage.rst-doc.patch (mbox) Adding cc: Gangbiao Liu email@example.com from line ‘From: Gangbiao Liu firstname.lastname@example.org‘ From: email@example.com To: firstname.lastname@example.org Cc: […]
What about the master branch for local git configuration in a git repository to make it track remote master branch? You may append these lines to .git/config in your cloned repository directory: [branch “master”] remote = origin merge = refs/heads/master Answered by Eric Z Ma.
Suppose I have following branches harryxiyou@common_vm ~/forest/sqle/sqle/scripts $ git branch * dev-harry master rc After I did some changes on dev-harry branch, I wanted to merge dev-harry into rc branch. 1, git checkout rc 2, git merge dev-harry References:http://stackoverflow.com/questions/24147169/merge-two-remote-branches-in-githttps://www.atlassian.com/git/tutorials/using-brancheshttp://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging Answered by harryxiyou. I usually add –no-ff during git merge to force git to add a […]
Currently, I have created my branch dev-harry but I cannot pull it successfully as follows. harryxiyou@common_vm ~/forest/kvplus/kvplus $ git branch * dev-harry master rc harryxiyou@common_vm ~/forest/kvplus/kvplus $ git pull You asked me to pull without telling me which branch you want to merge with, and ‘branch.dev-harry.merge’ in your configuration file does not tell me, either. […]
A commit is not the HEAD now. and git commit –amend will not work for it. How to change its commit message? You can use git rebase together with git commit –amend as follows. Assume your commit to be edited is 2b8ed. $ git rebase -i 2b8ed^ Change the pick to edit in the line […]
We may need to maintain a dev-name branch on git remote server to share your codes. How to create the branch? 1, git checkout -b your_branch_name 2, Do your changes, add commit 3, git push origin your_branch_name References:http://stackoverflow.com/questions/1519006/how-do-you-create-a-remote-git-branch Answered by harryxiyou.
I find git diff output is not easy to read when the text file contains long lines that is long enough to exceeds the screen size. We may not forbid the using the long lines for all files. How to handle lone lines in git diff better? Two possible methods to make git diff with […]
I know that one can make a zip of the current branch by: git archive -o archive.zip HEAD However, at situations, one may want to clone a copy/snapshot of remote repository at a specific branch because: 1) The repository is large with long history and cloning the whole history takes too much time. 2) What […]
How to view a file at a specific commit/revision in git? You can use git show to view a file’s content at a specific commit in git: http://www.pkill.info/linux/man/1-git-show/ $ git show REVISION:/path/to/file You can also save a copy by $ git show REVISION:/path/to/file >file.copy Answered by Eric Z Ma.
I wanna migrate leveldb (code.google.com/p/leveldb) to my github repository. Create a new repo on github.com with this link https://help.github.com/articles/creating-a-new-repository git clone https://code.google.com/p/ project-name.git Set the remote origin url as follows: git remote set-url origin https://github.com/ username/ repo-name.git git pull to pull the latest. git push origin master after making local changes. This is the original […]
Tutorials on how to create patches and apply patches with git. A nice tutorial: https://ariejan.net/2009/10/26/how-to-create-and-apply-a-patch-with-git/ Manuals: git format-patch: http://www.pkill.info/linux/man/1-git-format-patch/git apply: http://www.pkill.info/linux/man/1-git-apply/ Answered by Eric Z Ma.