tl;dr; no Longer version: In my experience, git is very good at detecting the move/rename as long as the file is unmodified. Git uses heuristics to attempt and locate the move. It can be fooled by having several files that are too similar, or if the file has been modified during the move, causing it … Read more
(Update April 2017 for Git 2.13, Q2 2017) There is now an official command to determine if a repo is a submodule of a parent repo: cd /path/to/potential/submodule/repo git rev-parse –show-superproject-working-tree See commit bf0231c (08 Mar 2017) by Stefan Beller (stefanbeller). (Merged by Junio C Hamano — gitster — in commit 3edcc04, 17 Mar 2017) … Read more
like the other answers say, git is for version control, e.g. for textfiles. You build a docker container from a “dockerfile” (which is a textfile). This “dockerfile” is placed in a directory with many other files and folders. So if you put this directory, where the dockerfile is located in, into a git repository, then … Read more
It isn’t the responsibility of the commit command to decide how to treat whitespaces, but the responsibility of the blame command because it is blame which analyzes the differences between versions to get the author of each line. So searching for an option to ignore whitespace in blame: The option -w is defined as: “Ignore … Read more
A revision is specified by its SHA1 hash. If you want to see commits for specific files, you have to separate paths with –: git log oldhash..newhash — path/to/inspect does this. Also note that you are using three dots (…) to specify the range. Usually, you only want two dots. Three dots might not give … Read more
This error can occur when you have changed the core.autocrlf config option but have not deleted and re-checked-out your working tree. So either change core.autocrlf back to what it was, or push up your changes, delete your repo and clone it again.
Short answer git filter-branch offers exactly the functionality you want. With the –subdirectory-filter option you can create a new set of commits where the contents of subDirectory are at the root of the directory. git filter-branch –prune-empty –subdirectory-filter subDirectory — –branches Walkthrough The following is an example to perform this in a safe way. You … Read more
As mentionned in “ignoring doesn’t remove a file “ (the following quote the great article from Nick Quaranto, in his blog git ready “learn git one commit at a time”): When you tell Git to ignore files, it’s going to only stop watching changes for that file, and nothing else. This means that the history … Read more
Consider the command git svn it has a similar log function than git log: git svn log it has the find-rev option (to retrieve the SVN revision from a SHA1 key) (introduced in git 1.6.0) I am not sure of you can combine those two options in one command line though. A script (a bit … Read more
Expanding on what William Pursell said, you probably ended up in vim. Save your changes and exit the editor by typing : to enter a command, followed by wq, then press enter. To exit vim without saving your changes do :q! instead. To change this default to something you’re more familiar with, you can set … Read more