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.
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
You can tag a revision right after your commit or later (after a push). Then, you can push your tag with: git push origin [tagname]. So, yes, your sequence is ok. Take a look at this, for more details: https://git-scm.com/book/en/v2/Git-Basics-Tagging.
What worked well for me (worked with GitHub, self hosted BitBucket, most likely will work on GitLab too). Pre-requisites Note, that despite the name, password here is your access token generated by GitHub and NOT your GitHub password. from git import Repo full_local_path = “/path/to/repo/” username = “your-username” password = “your-password” remote = f”https://{username}:{password}@github.com/some-account/some-repo.git” Clone … Read more
You have to either set requireForce to false in your .gitconfig or use the -f or -i flag with this command. git clean -f will force to clean the untracked files even if clean.requireForce is set to true which is default. git clean -i will give you an interactive way for cleaning each file git … Read more
(Annotated) tags won’t make Git sluggish, only harder to use in that you will have an harder time to find relevant tags amongst all the intermediate ones. Worst case, it can make your web interface (like GitHub) sluggish if it has to display thousands of tags. Maybe all those tags don’t need to be pushed, … Read more