How to do a pull request in GitHub with only the latest commit in the master branch of my forked repository

This answer from a coworker fixed my problem: git checkout -b NEW_BRANCH_NAME LAST_COMMIT_NAME_BEFORE_THE_ONE_WANTED git cherry-pick COMMIT_NAME_WANTED git push origin NEW_BRANCH_NAME Then on GitHub you can do a pull request for the new branch you created. UPDATE I asked and answered this question when I first started working with git. Now that I know more about … Read more

Github pull request shows wrong diff

Despite the misleading/broken github interface there’s actually a way to get what you want. You need to drop one . Instead of: https://github.com/account/repo/compare/ath/branchA…branchB do https://github.com/account/repo/compare/ath/branchA..branchB This compares branch heads instead of simply using the base branch to find the merge base. github’s reponse is what clued me in from @edwin-evans’ response: This is a result … Read more

Ignoring specific files, file types or folders in a pull request diff

Github supports this now with a .gitattributes file. Create a .gitattributes file in the root of the repository. Use the linguist-generated attribute to mark or unmark paths that you would like to be ignored for the repository’s language statistics and hidden by default in diffs. For example, to mark search/index.json as a generated file, add … Read more

Github: Find PRs where user is a reviewer

As of 2017-01-23, Github have added this functionality. Search You can filter pull requests based their review status (none, required, approved, changes requested, or required), by reviewer, and by requested reviewer. For example: type:pr review:none Matches pull requests that have not been reviewed. type:pr review:required Matches pull requests that require a review before they can … Read more

Pulling from Git fails and gives me following error: client_global_hostkeys_private_confirm: server gave bad signature for RSA key 0

The message “client_global_hostkeys_private_confirm: server gave bad signature for RSA key 0” is not an error, it is a warning, and it is related to some ssh versioning issue. It used to be very common to receive from GitLab. If you want it to go away, you can make sure that your ~/.ssh/config contains the following: … Read more

tech