\git log filename.ext
\git checkout <revision> filename.ext
For example:
\git log filename.ext
commit 875465be775031545f9c7f89as8025373df63e23
Author: AUTHORNAME
Date: Sun Jul 19 01:20:11 2015 -0700
.
commit 8409d2b3aaff1276c1266748397fe3d6e9576961
Author: AUTHORNAME
Date: Thu Jul 2 10:54:37 2015 -0700
misc, theme updates, media locally cached
git checkout 4d0f80012abfe9d074db841ae36f07f0722f31c8 -- filename.ext
Why there isn't a git checkout -1 -- filename.ext - type command is beyond me. I think maybe that's HEAD~1 but I haven't tested this.
I was told the right command was git checkout <filename> -1 but that didn't work..
There is also git reset
See also:
Fix the default git push ∞
Cloned something and want to fix its default push?
\git remote rm origin
\git remote add origin git://github.com/spiralofhope/shoes.git
.. hrm, not working right, try editing .git/config and changing the url line to something like git@github.com:spiralofhope/random-shoes.git
Tagging ∞
\git tag "v1.3"
\git push --tags
This provides a new package to download.
Rename a tag ∞
I am told it is the following, but for me it only deleted the old tag!
OLD_TAG="some text"
NEW_TAG="some text"
git push origin refs/tags/${OLD_TAG}:refs/tags/${NEW_TAG} :refs/tags/${OLD_TAG}
git tag -d ${OLD_TAG}
Download everything fresh ∞
Downloading everything fresh. Maybe after accepting a pull request.
\git pull git@github.com:spiralofhope/shoes-contrib.git master
Deleting using the github UI:
- Visit your repository
-
Find the row: Commits | Branch | Releases | Contributor, click releases
- You will see a list of all releases.
- At the top-left,
Releases | Tags, click Tags
- Click on the name of one of the releases
-
At the top-right, Edit release | Delete
Synchroninzing your github tag deletion to your local git repository:
git tag -l | xargs git tag -d
git fetch
Renaming a tag in a local git repository:
NEW_TAG_NAME=newtag
OLD_TAG_NAME=oldtag
git tag $NEW_TAG_NAME $OLD_TAG_NAME
git tag -d $OLD_TAG_NAME
git push origin :refs/tags/$OLD_TAG_NAME
git push --tags
Revisionism ∞
Forgot to check in an old revision of a file ∞
See also http://stackoverflow.com/questions/3895453/how-do-i-make-a-git-commit-in-the-past
Well there's no easy way. It's probably doable but I can't find a solution.
The closest I get is an incomplete solution: http://blog.xkoder.com/2009/06/06/git-tutorial-part-ii-sharpen-you-git-fu-with-10-more-commands/
Find the commit hash before the file you want to modify, then check it out.
\git checkout COMMIT_HASH
Make your changes, then commit them.
\git commit -a
FIXME ... then supposedly there's a way to propagate the changes back to the master's HEAD. Fucked if I know how. The above link doesn't actually explain that. I am disappoint.
Go back to the present.
\git checkout master
Remove all trace of a file ∞
BFG Repo-Cleaner
Repository maintenance - compression / optimization ∞
I don't understand these things, but they do stuff and things and that's good. Probably.
\git fsck
\git gc
(gc will fix shit that fsck finds)
Fix ESC[33m and ESC[m and restore colour ∞
\git config --global core.pager "less -r"
Actually add files ∞
I don't know what fucking idiot would have git add -A not work as expected, but this seems to work:
\git rm --cached -r directory
\git add directory
readlink function not implemented ∞
error: readlink("path/to/filename"): Function not implemented
error: unable to index file path/to/filename
fatal: updating files failed
https://stackoverflow.com/questions/11728882#comment56217354_11728882
git config core.symlinks true instead of git config core.symlinks false got rid of the error for me. Consequently, the symlinks I created using mklink in Windows were pushed without error, but when cloning the project again, the symlinks become text files that says where the original files are located instead of working as a real symlink.
Tested 2016-07-20 with 2.9.0.windows.1 - it seems to work.
Ignoring files ∞
Within /.gitignore
If you want to remove all trace of a file from git history, you'll have to perform additional steps described elsewhere.
Synchronize clone with its repository file creation times ∞
https://github.com/tst2005/git-timesync/
(archived)
When you make a git clone the created file are the current date. This script allow you to change the file timestamp to the same than the repository one.
Compare local edit to remote change ∞
Changes to all files ∞
\git diff
Changes to a specific file ∞
https://stackoverflow.com/a/31703666
\git diff origin/master:./ -- README.md
\git diff HEAD^:./ -- README.md
\git diff stash@{0}:./ -- README.md
\git diff 1A2B3C4D:./ -- README.md
Visually ∞
Not tested, vi is insane:
https://stackoverflow.com/a/34180341
\git difftool
It will start your diff app automatically for each changed file.
Windows: If you did not set a diff app, you can do it like in the example below(I use Winmerge):
\git config --global merge.tool winmerge
\git config --replace --global mergetool.winmerge.cmd \
"\"C:\Program Files (x86)\WinMerge\WinMergeU.exe\" -e -u -dl \"Base\" -dr \"Mine\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\""
\git config --global mergetool.prompt false
Split a directory into its own repository ∞
2017-08-30
folder=my_folder
branch=master
\git filter-branch \
--prune-empty \
--subdirectory-filter "$folder" \
"$branch" \
` # `
You may need to edit .git/config to update url or other settings.
If you intend to host this repository on GitHub, then follow their new repository creation documentation and see also GitHub's documentation on splitting a subfolder out into a new repository.
git fsck shows dangling tree ∞
git fsck
[spoiler name="example"]
Checking object directories: 100% (256/256), done.
Checking objects: 100% (9845/9845), done.
dangling tree 128e5356316731484ca660822ddd4a981b142773
dangling tree b2adbe017562c32ff31f49946b18c6af23571427
dangling tree 6bb337c6e8f591529c1a628e805c6c6f9a14e0dd
dangling tree 8941163d26e37602010799648002db75a0efd0b5
dangling tree b7ce9b153e11f6b123e818aa246f81a072d5689b
dangling tree 6cf417ae0cf811c982171c2082d4ff2c747477aa
