The important thing to realize about git diff A B is that it only ever shows you the difference between the states of the tree between exactly two points in the commit graph – it doesn’t care about the history. The .. and … notations used for git diff have the following meanings: So when … Read more
Eureka! After reading this – Search based on the contents of a repository, the answer was clear! Search by README.md file content! Use GitHub’s search engine and provide a unique combination of words that appear in your README.md file. This is how I do it for my template – unfor19/terraform-multienv in:readme sort:updated -user:unfor19 “tfmultienv”github.com/search?q=in%3Areadme+sort%3Aupdated+-user%3Aunfor19+%22%60tfmultienv%60%22&type=repositories To … Read more
Since February 2016, you can add/create/upload new files from the GitHub web interface. See “Upload files to your repositories “: You can click the “Upload files” button in the toolbar at the top of the file tree. Or, you can drag and drop files from your desktop onto the file tree. This replaces the file … Read more
Github does not provide such functionality. Github repositories are either public or private, both not both. However, if the part you want to share is small enough (let’ say 4-5 files) you can create a public gist. Unfortunately, there is no way to update the gist automatically.
The main Git installer for Windows is msysgit (SO question). TortoiseGit is also a nice Windows integration (on top of msysgit). You need to be aware of Git limits, particularly in term of Git repository (do not try to stuff every projects into one repo, unless you are building a “system”, i.e. something which can … Read more
I want to be able to perform this diff before merging, including on files without merge conflicts. You just have to set up the index as you like, you never have to commit results. The way to set up for exactly what was asked, straight diffs-since-base with no merge prep, is git merge -s ours … Read more
This article advises to instead of merging two branches, you would rebase them where git would only rebase non duplicate commits. But instead of cherry-picking, you might consider just rebasing the branch: rebase –onto release B bug where release is the release branch and bug is the bug branch. You then get something like C’—D’ … Read more
If you can use symlinks (e.g. you are not using Windows), then you can set up core and core.php like this: # “base” repository layout: core/ core.app # each app repository layout: base/ core/ core.php core -> base/core/ core.php -> base/core.php app/ In each app repository, the base/ directory is either a submodule that uses … Read more
You could use the gitattributes mechanism to define a custom merge driver (like this one for instance) in order to copy automatically the relevant sections. [merge “aggregate”] name = agregate both new sections driver = aggregate.sh %O %A %B It will be a 3-way merge, which means you can easily diff %A and %B against … Read more
If you use Rubberduck VBA, after clicking You can use the file menu to “Export Active Project”, which exports the form binaries and the code as BAS objects, which are just plain text. Then you can commit to git.