Using Git - Revision history

Shardulc: Branches

2018-03-10T20:16:34Z

Branches

Sushain: /* Removing/undoing all changes since the last commit */

2018-03-10T00:26:44Z

Removing/undoing all changes since the last commit

Francis Tyers: /* Developers working on many pairs/languages */

2018-03-09T09:33:43Z

Developers working on many pairs/languages

Shardulc: /* Developers working on a few pairs/languages */

2018-03-09T02:12:21Z

Developers working on a few pairs/languages

Shardulc: /* Developers working on a few pairs/languages */

2018-03-09T01:55:42Z

Developers working on a few pairs/languages

Shardulc: Add cheatsheet

2018-03-09T01:51:33Z

Add cheatsheet

Sushain: Sushain moved page Using git to Using Git

2018-03-08T01:57:31Z

Sushain moved page Using git to Using Git

Sushain at 01:56, 8 March 2018

2018-03-08T01:56:24Z

Shardulc: Add migration stuff

2018-03-02T06:21:05Z

Add migration stuff

Rcrowther at 12:22, 26 September 2016

2016-09-26T12:22:59Z

@@ Line 40: / Line 40: @@
 If submodules are too cumbersome you can also just set up the apertium-style directory structure manually and use scripts to checkout the contents of individual parts.
+===Working with branches===
+Branch <code>new-feature</code> exists on the repository but not in your clone.
+====If you used <code>--depth</code> while cloning====
+<pre>
+git fetch --unshallow origin new-feature
+git checkout new-feature
+</pre>
+====If you did not use <code>--depth</code> while cloning====
+<pre>git checkout new-feature</pre>
 ===Avoid entering password every time===

@@ Line 78: / Line 78: @@
 What this does: If you've added new files to be committed, the're "unadded" (but not deleted); if you've made changes to tracked files, the changes are removed so they look like what they were in the last commit. (Bonus point: changes removed with stash can be re-added if you change your mind with <code>git stash pop</code>.)
+Add <code>-p</code> to select chunks of each file that should be stashed.
-This only works on ''all'' changes (you can't stash a specific file).
 ===Reverting your branch to the state of a remote branch===

@@ Line 25: / Line 25: @@
 To see other people's changes: <code>git pull</code>
-===Developers working on many pairs/languages===
+===Developers working on many pairs/languages (1)===
 Note: <code>apertium-all</code> will get literally everything. Other options are <code>apertium-languages</code>, <code>apertium-trunk</code>, <code>apertium-staging</code>, <code>apertium-incubator</code>, <code>apertium-nursery</code>, <code>apertium-tools</code>.
@@ Line 36: / Line 36: @@
 # <code>git submodule foreach 'git commit -a -m <message>'</code>
 # <code>git submodule foreach 'git push'</code>
+===Developers working on many pairs/languages (2)===
+If submodules are too cumbersome you can also just set up the apertium-style directory structure manually and use scripts to checkout the contents of individual parts.
 ===Avoid entering password every time===

@@ Line 13: / Line 13: @@
 For each pair/language, initial checkout/clone: <code>git clone <nowiki>https://github.com/apertium/apertium-<langcode or pair>.git</nowiki></code>
+If there is too much history and you don't need it, you can do <code>git clone --depth N <nowiki>https://github.com/apertium/apertium-<langcode or pair>.git</nowiki></code> to get only the last N commits in history.
 To make a commit:

@@ Line 12: / Line 12: @@
 ===Developers working on a few pairs/languages===
-Initial checkout/clone: <code>git clone <nowiki>https://github.com/apertium/apertium-<langcode or pair>.git</nowiki></code>
+For each pair/language, initial checkout/clone: <code>git clone <nowiki>https://github.com/apertium/apertium-<langcode or pair>.git</nowiki></code>
 To make a commit:

@@ Line 7: / Line 7: @@
 * <code>[[languages]]</code> &mdash; this holds the main development tree for individual languages (depended on by translation pairs),
 * <code>[[incubator]], [[nursery]], [[staging]]</code> &mdash; these hold work-in-progress modules (mostly language pairs) that have not yet made it into <code>trunk</code> or <code>languages</code>.
+==Quick cheatsheet==
+===Developers working on a few pairs/languages===
+Initial checkout/clone: <code>git clone <nowiki>https://github.com/apertium/apertium-<langcode or pair>.git</nowiki></code>
+To make a commit:
+# <code>git add <files that you changed></code>
+# <code>git commit -m <message></code> (commits will be stored to your computer)
+# <code>git push</code> (commits will be sent to GitHub)
+Note: Steps 1 and 2 above can be done multiple times even when offline, and then all the commits can be pushed at once when online.
+To see other people's changes: <code>git pull</code>
+===Developers working on many pairs/languages===
+Note: <code>apertium-all</code> will get literally everything. Other options are <code>apertium-languages</code>, <code>apertium-trunk</code>, <code>apertium-staging</code>, <code>apertium-incubator</code>, <code>apertium-nursery</code>, <code>apertium-tools</code>.
+Initial checkout/clone: <code>git clone --recurse-submodules --shallow-submodules --depth 1 https://github.com/apertium/apertium-all.git</code>
+(Change <code>--depth 1</code> to <code>--depth N</code> to get the last N commits)
+To make a commit:
+# <code>git submodule foreach 'git commit -a -m <message>'</code>
+# <code>git submodule foreach 'git push'</code>
+===Avoid entering password every time===
+[https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/ SSH keys] work exactly like on SourceForge. You will have to clone the repository again, with the URL <code><nowiki>git@github.com:apertium/apertium-whatever.git</nowiki></code>.
 ==Learning to use git==

← Older revision	Revision as of 01:57, 8 March 2018
(No difference)

@@ Line 1: / Line 1: @@
+{{TOCD}}
+Apertium development code is kept in [https://github.com/apertium GitHub]. To browse the repositories in a more compact fashion,
+visit the [https://apertium.github.io/apertium-on-github/source-browser.html source browser]. The following shorthands are used there:
+* <code>[[trunk]]</code> &mdash; this holds the main development tree for released translation pairs,
+* <code>[[languages]]</code> &mdash; this holds the main development tree for individual languages (depended on by translation pairs),
+* <code>[[incubator]], [[nursery]], [[staging]]</code> &mdash; these hold work-in-progress modules (mostly language pairs) that have not yet made it into <code>trunk</code> or <code>languages</code>.
 ==Learning to use git==
@@ Line 78: / Line 86: @@
 Method 1: [[IRC]]
 * user [[User:Shardulc|Shardulc]] ([[User talk:Shardulc|talk]]), IRC nickname 'shardulc'
+* user [[User:Sushain|Sushain]] ([[User talk:Sushain|talk]]), IRC nickname 'sushain' / 'sushain97'
 Method 2: Email
 * user [[User:Shardulc|Shardulc]] ([[User talk:Shardulc|talk]]), email <shardul DOT chiplunkar AT gmail DOT com>
+* user [[User:Sushain|Sushain]] ([[User talk:Sushain|talk]]), email <apertium@skc.name>

@@ Line 1: / Line 1: @@
+==Learning to use git==
-==Removing/undoing all changes since the last commit==
+If you have not used git before, or are uncomfortable with using git, these resources can help you:
+* https://try.github.io/levels/1/challenges/1 (interactive, short, lets you practice with a mock repository, covers most things commonly needed but nothing advanced)
+* http://rogerdudler.github.io/git-guide/ (less text/explanation, more commands/links, good for reference or brushing up forgotten git knowledge)
+* http://gitimmersion.com/ (divided into detailed 'lessons', like a self-paced online course, intermediate to advanced level)
+* https://www.ibm.com/developerworks/library/l-git-subversion-1/index.html (git tutorial for SVN users, long and verbose)
+If you have further questions:
+* See [[#Advanced git commands]]
+* Ask Apertium's [[#In-house git help]]
+* Or, of course, ask on StackOverflow, read the git documentation, etc.
+==Learning to use GitHub==
+If you have not used GitHub before, or are uncomfortable with using GitHub, these resources can help you:
+* https://services.github.com/on-demand/intro-to-github/ (intro to using GitHub, assumes a little git knowledge)
+* https://guides.github.com/ (various topics at all levels)
+The [https://help.github.com/ official GitHub documentation] is extensive and helpful. Specific questions can be answered by [[#In-house git help]].
+==Avoiding git completely==
+For some reason, if you don't like git or don't want to learn git or are unable to learn git, you can avoid using git completely for all GitHub repositories. You will simply need to perform a fresh SVN checkout with the correct URL and you can continue using the same SVN commands and workflow that you are used to. [https://blog.github.com/2012-06-26-collaborating-on-github-with-subversion/ This page] explains how to do this.
+==Advanced git commands==
+===Removing/undoing all changes since the last commit===
 <pre>
 git stash
@@ Line 8: / Line 35: @@
 This only works on ''all'' changes (you can't stash a specific file).
-==Reverting your branch to the state of a remote branch==
+===Reverting your branch to the state of a remote branch===
 If on branch '''master''', you want to get your repo to what the remote '''master''' looks like:
 <pre>
@@ Line 22: / Line 49: @@
 </pre>
-==Removing/undoing your changes to a certain file / path==
+===Removing/undoing your changes to a certain file / path===
 <pre>
  git checkout -- <path>
@@ Line 38: / Line 65: @@
 </pre>
-==Merge conflict: Throw away local changes==
+===Merge conflict: Throw away local changes===
 <pre>
@@ Line 47: / Line 74: @@
 (The last command should now do nothing, just say you're fully merged.)
-==Friendly intros to git==
+==In-house git help==
+Method 1: [[IRC]]
+* user [[User:Shardulc|Shardulc]] ([[User talk:Shardulc|talk]]), IRC nickname 'shardulc'
+Method 2: Email
+* user [[User:Shardulc|Shardulc]] ([[User talk:Shardulc|talk]]), email <shardul DOT chiplunkar AT gmail DOT com>
+Method 3: [[Contact]] via mailing lists, especially apertium-stuff
-* http://try.github.com/
-* http://rogerdudler.github.io/git-guide/
-* http://gitimmersion.com/
-== See Also ==
-* [[Using GIT with Apertium SVN]]
 [[Category:Documentation]]

@@ Line 57: / Line 57: @@
 [[Category:Documentation]]
+[[Category:Documentation in English]]
 [[Category:git]]