Using git show To complete your own answer, the syntax is indeed git show object git show $REV:$FILE git show somebranch:from/the/root/myfile.txt git show HEAD^^^:test/test.py The command takes the usual style of revision, meaning you can use any of the following: branch name (as suggested by ash) HEAD + x number of ^ characters The SHA1 … Read more
To push up through a given commit, you can write: git push <remotename> <commit SHA>:<remotebranchname> provided <remotebranchname> already exists on the remote. (If it doesn’t, you can use git push <remotename> <commit SHA>:refs/heads/<remotebranchname> to autocreate it.) If you want to push a commit without pushing previous commits, you should first use git rebase -i to … Read more
Very much a porcelain command, not good if you want this for scripting: git branch -vv # doubly verbose! Note that with git 1.8.3, that upstream branch is displayed in blue (see “What is this branch tracking (if anything) in git?”) If you want clean output, see Carl Suster’s answer – it uses a porcelain … Read more
You should be able to force your local revision to the remote repo by using git push -f <remote> <branch> (e.g. git push -f origin master). Leaving off <remote> and <branch> will force push all local branches that have set –set-upstream. Just be warned, if other people are sharing this repository their revision history will … Read more
You want the –stat option of git diff, or if you’re looking to parse this in a script, the –numstat option. git diff –stat <commit-ish> <commit-ish> –stat produces the human-readable output you’re used to seeing after merges; –numstat produces a nice table layout that scripts can easily interpret. I somehow missed that you were looking … Read more
I would like to provide a different perspective on what “git pull –rebase” actually means, because it seems to get lost sometimes. If you’ve ever used Subversion (or CVS), you may be used to the behavior of “svn update”. If you have changes to commit and the commit fails because changes have been made upstream, … Read more
Command to use: git config –global http.proxy http://proxyuser:proxypwd@proxy.server.com:8080 change proxyuser to your proxy user change proxypwd to your proxy password change proxy.server.com to the URL of your proxy server change 8080 to the proxy port configured on your proxy server Note that this works for both http and https repos. If you decide at any … Read more
You can’t merge with local modifications. Git protects you from losing potentially important changes. You have three options: Commit the change using git commit -m “My message” Stash it. Stashing acts as a stack, where you can push changes, and you pop them in reverse order. To stash, type git stash Do the merge, and … Read more
You can unstage files from the index using git reset HEAD — path/to/file Just like git add, you can unstage files recursively by directory and so forth, so to unstage everything at once, run this from the root directory of your repository: git reset HEAD — . Also, for future reference, the output of git … Read more
Put this .gitignore into the folder, then git add .gitignore. * */ !.gitignore The * line tells git to ignore all files in the folder, but !.gitignore tells git to still include the .gitignore file. This way, your local repository and any other clones of the repository all get both the empty folder and the … Read more