johnkeeping / git-integration Goto Github PK
View Code? Open in Web Editor NEWEasily manage integration branches in Git
Home Page: http://johnkeeping.github.io/git-integration
License: GNU General Public License v2.0
Easily manage integration branches in Git
Home Page: http://johnkeeping.github.io/git-integration
License: GNU General Public License v2.0
I really love this idea, but I don’t trust that I’ll always remember to use it properly. More importantly, in a collaboration-rich ecosystem like GitHub, there needs to be an automated way of alerting people that the repository they just cloned is using this thing called git-integration
.
I propose the following hooks:
Auto-update integration branch(es). This is just an ease-of-use feature. But there’s no reason not to include it! Rather than force people to run git integration --rebuild integration
, this should be automated with a hook.
When an integration branch is created, a message should alert the user about this hook, and tell them how to opt-out if they wish. (Given the purpose for git-integration
’s existence, I suspect that most users will prefer the automated rebuild.)
Prevent commits. Someone who isn’t familiar with git-integration
may clone a repo and not realize that an integration branch is supposed to be a “pre-assembled” branch. A hook should prevent unsuspecting users from committing to an integration branch, only to discover that they wasted their time when they find out the integration branch’s intended purpose.
Reminders. For newly-cloned repositories, it might be helpful if a hook printed out a message informing the user that this repository is using git-integration
, along with a URL for them to learn more.
It's unclear to me how two repositories on different servers should share git-integration instructions so that each can use git integration --rebuild
to produce the same resulting branch.
Hi, git-integration seems to have a problem with Git 1.7.10.4 on Debian 7.
When I create an integration sheet like this:
base master merge topic-1 merge topic-2
I get the following error:
$ git integration --edit --rebuild usage: git stripspace [-s | --strip-comments] < input fatal: Not a valid object name -p Failed to write instruction sheet commit
A declarative, efficient, and flexible JavaScript library for building user interfaces.
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
An Open Source Machine Learning Framework for Everyone
The Web framework for perfectionists with deadlines.
A PHP framework for web artisans
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
Some thing interesting about web. New door for the world.
A server is a program made to process requests and deliver data to clients.
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
Some thing interesting about visualization, use data art
Some thing interesting about game, make everyone happy.
We are working to build community through open source technology. NB: members must have two-factor auth.
Open source projects and samples from Microsoft.
Google ❤️ Open Source for everyone.
Alibaba Open Source for everyone
Data-Driven Documents codes.
China tencent open source team.