Is there a way to compare two diffs or patches?
diff <(git show COMMIT1SHA) <(git show COMMIT2SHA)
version-control
Put MySQL database under version control?
Note that in December 2012, you had another option: DBV (DataBase Version) It is based on this Github project (stalled in 2018), and is a database version control web application featuring schema management, revision scripts, and more. It has been discontinued since early 2021.
How to get Git diff of the first commit?
You can do: git diff 4b825dc642cb6eb9a060e54bf8d69288fbee4904 HEAD 4b825dc642cb6eb9a060e54bf8d69288fbee4904 is the id of the “empty tree” in Git and it’s always available in every repository.
How do I make Beyond Compare ignore certain differences while comparing versions of Delphi Form Files
Load a pair of DFM files showing the difference. Click the Session Settings button (aka Rules w/ umpire icon) or use the Session->Session Settings menu item. Switch to the Importance tab then click the Edit Grammar… button to open a second dialog. Click the New… button below the top listbox to open a third dialog. … Read more
Git: How to make outer repository and embedded repository work as common/standalone repository?
You can use below commands to add files from test2 repo to test repo as below: # In local test repo rm -rf test2 git clone https://github.com/eromoe/test2 git add test2/ git commit -am ‘add files from test2 repo to test repo’ git push Note: You should use git add test2/ (with slash, not git add … Read more
How can I force subversion to commit an unchanged file?
If you want the file contents to remain unchanged (meaning that you can’t merely change whitespace as johnstok suggested) you can always change one of the properties on the file. eg. svn propset dummyproperty 1 yourfile svn commit yourfile That will perform a commit without having to change the file. Just make sure that you … Read more
Where does a Git branch start and what is its length?
In Git, you could say that every branch starts at the root commit, and that would be quite literally true. But I guess that’s not very helpful for you. What you could do instead is to define “the start of a branch” in relation to other branches. One way you can do this is to … Read more
Visual Studio isn’t tracking changes, or checking out files from source control as I edit them
Right-click on your solution node and go down to “Go online”. For various reasons visual studio can mark your solution as tracked by source control, but “offline”. It is still tracking changes behind the scenes waiting for you to go online again. After doing this my pending changes window populated and all is normal. I … Read more
Diffing between two entire directories/projects in hg or git?
To simply create a diff patch in git’s diff format from two arbitrary files or directories, without any fancy repository stuff or version control: git diff –no-index some/path other/path > some_filename Jakub Narębski’s comment on knittl’s answer hinted at the answer… For simplicity’s sake, that’s the full command. The > part creates a file and … Read more
How to find untracked files in a Perforce tree? (analogue of svn status)
EDIT: Please use p4 status now. There is no need for jumping through hoops anymore. See @ColonelPanic’s answer. In the Jan 2009 version of P4V, you can right-click on any folder in your workspace tree and click “reconcile offline work…” This will do a little processing then bring up a split-tree view of files that … Read more