2023-05-03

Question How can I install gitk on a Mac? From their official website, it seems gitk comes with Git, but the version of my Git (git version 1.7.12.4 (Apple Git-37)) does not come with gitk. brew install gitk does not work for gitk. Version information (copied from comments): OS X v10.8.2 (12C2034) (Mountain Lion) Xcode version 4.6 (4H127) Answer Correct, the 1.7.12.4 (Apple Git-37) does not come with gitk. You can install a more recent version of Git + git-ui as a separate formula by using Homebrew (executable brew).…

#git

2023-05-03

Question What does git cherry-pick <commit> do? Answer Cherry-picking in Git means choosing a commit from one branch and applying it to another. This contrasts with other ways such as merge and rebase which normally apply many commits to another branch. It's also possible to cherry-pick multiple commits but merge is the preferred way over cherry-picking. Make sure you are on the branch you want to apply the commit to.…

#git

2023-05-02

Question I've pulled all remote branches via git fetch --all. I can see the branch I'd like to merge via git branch -a as remotes/origin/branchname. Problem is it is not accessible. I can't merge or checkout. Answer You can reference those remote tracking branches ~(listed with git branch -r) with the name of their remote. You need to fetch the remote branch: git fetch origin aRemoteBranch If you want to merge one of those remote branches on your local branch:…

#git

2023-05-02

Question I've been using Git on Windows (msysgit) to track changes for some design work I've been doing. Today I've been working on a different PC (with remote repo brian) and I'm now trying to merge the edits done today back into my regular local version on my laptop. On my laptop, I've used git pull brian master to pull the changes into my local version. Everything was fine apart from the main InDesign document - this shows as a conflict.…

#git

2023-05-01

Question I'm having a problem with my git repo. For the last couple of days whenever I do a push to the server I get this message: "Auto packing the repository for optimum performance", and it does not seem to go away and return the shell. I also tried checking out to a new branch and then doing a rebase on my previous branch and then did git gc to remove the unused history objects and then did a push but still this message appears.…

#git

2023-04-30

Question Closed. This question is opinion-based. It is not currently accepting answers. </div> Want to improve this question? Update the question so it can be answered with facts and citations by editing this post. Closed 4 years ago. Improve this question I'm trying to collect some of my default settings, and one thing I realized I don't have a standard for is .gitignore files. There's a great thread showing a good .…

#python

2023-04-30

Question I have a private repository on GitHub that I want to make public. However, some of the initial commits contain information that I don't want to publicize (hard-coded credentials, etc). What is the easiest route to make the latest commit public (I don't really need or want the previous commits in the public repository) without including some or all of the commit history? Answer You can limit the depth of the history while cloning:…

#git