From 9d03a3a4e70fe4233f8260b42542e8c2c0e35c07 Mon Sep 17 00:00:00 2001 From: markhuyong Date: Fri, 3 Aug 2018 11:28:34 +0800 Subject: [PATCH 1/8] Add: Udacity Git Commit Message Style Guide add Udacity Git Commit Message Style Guide --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6c46493..f756082 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,8 @@ Pull requests on interesting tools/projects/resources are welcome. ## Table of Contents - [Awesome Git](#awesome-git) - - [Tutorial](#tutorial) + - [Tutorial](#tutorial) + - [Style Guide](#style-guide) - [Client](#client) - [Repository Hosting](#repository-hosting) - [Self-Hosted Repository](#self-hosted-repository) @@ -45,6 +46,11 @@ Pull requests on interesting tools/projects/resources are welcome. * [CodeBasicsHub: Git Video Tutorials](http://codebasicshub.com/tutorial/git-github/what-is-git) * [Intermediate Git](http://www.columbia.edu/~zjn2101/intermediate-git/#1) - lower-level, more structural explanation of git concepts +## Style Guide +*Style guide when you work with git* + +* [Udacity Nanodegree Style Guide](https://udacity.github.io/git-styleguide/index.html) + ## Client *Git clients are available on every platform, from mainframe to your mobile device* From 1f9c309e4a81a8a4fd08a0d48adc2ee99a1e2161 Mon Sep 17 00:00:00 2001 From: Lars Kappert Date: Wed, 16 Jan 2019 14:25:19 +0100 Subject: [PATCH 2/8] Add release-it --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 16e4359..dd75cd5 100644 --- a/README.md +++ b/README.md @@ -133,6 +133,7 @@ Pull requests on interesting tools/projects/resources are welcome. * [ghq](https://github.com/motemen/ghq) — Organization for remote repositories * [bash-git-prompt](https://github.com/magicmonty/bash-git-prompt) - An informative and fancy bash prompt for Git users * [conventional-changelog](https://github.com/conventional-changelog/conventional-changelog) - a set of tools for parsing [conventional commit](https://conventionalcommits.org/) messages from git histories +- [release-it](https://github.com/webpro/release-it) - Automate releases for Git repositories and/or npm packages. Changelog generation, GitHub/GitLab releases, etc. ## Extensions *Git is designed for source control management. but people extend the idea and push version control to everywhere* From 8fd2e8c4ab51bebc64f04255027cb6aad2cd9cac Mon Sep 17 00:00:00 2001 From: Robert Lyall Date: Mon, 13 May 2019 12:00:37 +0100 Subject: [PATCH 3/8] Add another link to free Git tutorials --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 16e4359..c9cac75 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,7 @@ Pull requests on interesting tools/projects/resources are welcome. * [Use gitk to understand git](https://lostechies.com/joshuaflanagan/2010/09/03/use-gitk-to-understand-git/) - all important Git terms (commit, commit SHA, branch, merge, rebase) explained using gitk * [Learn Version Control with Git](https://www.git-tower.com/learn/) - freemium ebook from fournova Software (makers for Tower), associated with paid video course * [Pro Git](https://git-scm.com/book/) - free Git book, also available on paper (CC BY-NC-SA 3.0) +* [Learn how to use Git](https://www.deployhq.com/git) - free tutorials and resources to help you learn the basics of Git * [The Git Community Book](https://schacon.github.io/gitbook/) - book built by dozens of people in the Git community * [Git Pocket Guide](http://shop.oreilly.com/product/0636920024972) - a short O'Reilly book on Git * [Git Real: Code School](https://www.codeschool.com/courses/git-real/) - paid training course from Code School From 05a3720ae36a47f61ed358768c42ceaac0dcec05 Mon Sep 17 00:00:00 2001 From: amishscientist <40723230+amishscientist@users.noreply.github.com> Date: Thu, 16 May 2019 09:53:24 -0500 Subject: [PATCH 4/8] Update README.md I add 2 links I found very useful when I was first starting out. 1. Git School Dude - The channel makes great videos most of the time I can get through them during my lunch. I often send my co-workers links to his videos on sub modules when I find them getting confused. 2. Git choose your own adventure was a life saver starting out. Coming from sub version it was a brave knew world. I found that web site helped me and several of my co-workers to not panic in our early days when made mistakes. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 16e4359..6e1039a 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,8 @@ Pull requests on interesting tools/projects/resources are welcome. * [The Git Parable](http://tom.preston-werner.com/2009/05/19/the-git-parable.html) - GitHub Cofounder's Narrative-style Intro to Git Concepts * [CodeBasicsHub: Git Video Tutorials](http://codebasicshub.com/tutorial/git-github/what-is-git) * [Intermediate Git](http://www.columbia.edu/~zjn2101/intermediate-git/#1) - lower-level, more structural explanation of git concepts +* [Git School Dude](https://www.youtube.com/c/DanGitschoolDude) - It's a YouTube channel with a lot of great git videos. It covers everything from the basics to advanced Git topics. +* [A Git Choose Your Own Adventure](http://sethrobertson.github.io/GitFixUm/fixup.html) - I never found a git tutorial I didn't understand while doing it. Just sometimes those tutoars didn't line up very well with my actual work. This git help in the form of a choose your own adventure was a life saver when I was fisrt starting out. ## Client *Git clients are available on every platform, from mainframe to your mobile device* From bc33066c0e74695a8050f4c24bd91e9c8cc6c372 Mon Sep 17 00:00:00 2001 From: Nav Saini Date: Wed, 28 Aug 2019 18:40:47 +0530 Subject: [PATCH 5/8] Add Fork git client --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 16e4359..70bc9e7 100644 --- a/README.md +++ b/README.md @@ -63,6 +63,7 @@ Pull requests on interesting tools/projects/resources are welcome. * [GitExtensions](https://gitextensions.github.io/) - a shell extension, a Visual Studio 2010-2015 plugin and a standalone Git repository tool. * [WorkingCopy](https://workingcopyapp.com) - a powerful Git client for iOS. Free with in-app purchase to unlock the ability to push commits. * [Git Add-ons](https://github.com/stevemao/awesome-git-addons) - Enhance the basic `git` CLI +* [Fork](https://git-fork.com) - An awesome and free git client for macOS and Windows ## Repository Hosting From f2e2df0455cc46a9f6202d3ebb1f8f8574b0d700 Mon Sep 17 00:00:00 2001 From: flerka <6013716+flerka@users.noreply.github.com> Date: Tue, 8 Oct 2019 16:43:30 +0300 Subject: [PATCH 6/8] guide of undoing, fixing or removing commits --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 16e4359..9f5651b 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,7 @@ Pull requests on interesting tools/projects/resources are welcome. * [The Git Parable](http://tom.preston-werner.com/2009/05/19/the-git-parable.html) - GitHub Cofounder's Narrative-style Intro to Git Concepts * [CodeBasicsHub: Git Video Tutorials](http://codebasicshub.com/tutorial/git-github/what-is-git) * [Intermediate Git](http://www.columbia.edu/~zjn2101/intermediate-git/#1) - lower-level, more structural explanation of git concepts +* [On undoing, fixing, or removing commits in git](https://sethrobertson.github.io/GitFixUm/fixup.html) - fairly comprehensive guide to recovering from what you did not mean to do when using git ## Client *Git clients are available on every platform, from mainframe to your mobile device* From 20e5d2b41e4dea1cf2de839a21334aa9ce2e1ce6 Mon Sep 17 00:00:00 2001 From: Dick Tang Date: Mon, 16 Dec 2019 21:59:07 +0800 Subject: [PATCH 7/8] add Aoneflow --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a7bf194..6379f41 100644 --- a/README.md +++ b/README.md @@ -114,6 +114,7 @@ Pull requests on interesting tools/projects/resources are welcome. * [GitHub flow](http://scottchacon.com/2011/08/31/github-flow.html) - a simple branching model with a single master * [GitLab flow](https://about.gitlab.com/2014/09/29/gitlab-flow/) * [Git DMZ Flow](https://gist.github.com/djspiewak/9f2f91085607a4859a66) +* [Aoneflow](https://www.alibabacloud.com/blog/how-do-we-manage-code-branches-at-alibaba_593834) - an interesting branch model which delays the final merge to production branch, adopted by Alibaba. more article (in Chinese text) at [1](https://segmentfault.com/a/1190000016373314), [2](https://yq.aliyun.com/articles/573549) ## Hook management *Git provide hooks at commit/push phrase, allowing integration with and code quality checking tool and Continuous Integration (CI)* From cc4372d6b4bb3221098013574598ea7c4d8ea5b4 Mon Sep 17 00:00:00 2001 From: Dick Tang Date: Mon, 16 Dec 2019 22:15:31 +0800 Subject: [PATCH 8/8] Create LICENSE --- LICENSE | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..0e259d4 --- /dev/null +++ b/LICENSE @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work.