Use git diff, with name-only to show only the names, and diff-filter=U to only include ‘Unmerged’ files (optionally, relative to show paths relative to current working directory) . git diff –name-only –diff-filter=U –relative
To permanently accept a specific certificate Try http.sslCAPath or http.sslCAInfo. Adam Spiers’s answer gives some great examples. This is the most secure solution to the question. To disable TLS/SSL verification for a single git command try passing -c to git with the proper config variable, or use Flow’s answer: git -c http.sslVerify=false clone https://example.com/path/to/git To … Read more
The closest thing to renaming is deleting and then recreating on the remote. For example: git branch -m master master-old git push remote :master # Delete master git push remote master-old # Create master-old on remote git checkout -b master some-ref # Create a new local master git push remote master # Create master on … Read more
Using git v1.8.0 or later: git branch branch_name –set-upstream-to your_new_remote/branch_name Or you can use the -u switch git branch branch_name -u your_new_remote/branch_name Using git v1.7.12 or earlier git branch –set-upstream branch_name your_new_remote/branch_name
I generally like to merge master into the development first so that if there are any conflicts, I can resolve in the development branch itself and my master remains clean. (on branch development)$ git merge master (resolve any merge conflicts if there are any) git checkout master git merge development (there won’t be any conflicts … Read more
Check out the aq branch, and rebase from master. git checkout aq git rebase master
Yes: git rev-parse –show-toplevel If you want to replicate the Mercurial command more directly, you can create an alias: git config –global alias.root ‘rev-parse –show-toplevel’ and now git root will function just as hg root. Note: In a submodule this will display the root directory of the submodule and not the parent repository. If you … Read more
From the release notes for 1.6.2 @{-1} is a way to refer to the last branch you were on. This is accepted not only where an object name is expected, but anywhere a branch name is expected and acts as if you typed the branch name. E.g. git branch –track mybranch @{-1}, git merge @{-1}, … Read more
Just include #xxx in your commit message to reference an issue without closing it. With new GitHub issues 2.0 you can use these synonyms to reference an issue and close it (in your commit message): fix #xxx fixes #xxx fixed #xxx close #xxx closes #xxx closed #xxx resolve #xxx resolves #xxx resolved #xxx You can … Read more
You git reset –hard your local branch to remove changes from working tree and index, and you git push –force (or git push –force-with-lease) your revised local branch to the remote. (other solution here, involving deleting the remote branch, and re-pushing it) This SO answer illustrates the danger of such a command, especially if people … Read more