Gergely Polonkai
66bca05ec7
Added remark about stashing untracked files
2013-09-23 09:17:22 +02:00
0b2c4af8e1
Merge pull request #67 from techy1157/patch-1
...
Fixed minor grammar error: Changed when to once
2013-08-01 05:37:58 -07:00
6edcfa52a6
Changed when to once
...
"Once" is used once an action is complete, while "When" is used when an action begins.
2013-07-31 22:49:37 -05:00
b5f23fc29c
Merge pull request #66 from yaotti/correct-dirname-japanese
...
Refine dirname: "konnichiwa" is correct as Japanese "good afternoon"
2013-07-29 09:30:38 -07:00
ffcf1ac2bf
Refine dirname: "konnichiwa" is correct as Japanese "good afternoon"
2013-07-28 10:58:18 +09:00
54c2ddc06a
Merge pull request #65 from github/cc-by-license
...
Convert to CC-BY-3.0
2013-07-12 13:13:01 -07:00
07fa93ddd6
Convert to CC-BY-3.0
...
This brings gitref.org in line with other OSS Github Training repos.
2013-07-12 21:18:38 +02:00
f0e513ab10
Merge pull request #60 from robertd/gh-pages
...
fix position of 'git branch -v'
2013-02-08 08:33:57 -08:00
2f8f44fc89
fix the position of 'git branch -v'
2013-02-08 09:26:32 -07:00
e6319d0dfe
Merge pull request #59 from robertd/gh-pages
...
Add 'git branch -v' and 'git remote rename' explanations
2013-02-07 20:07:05 -08:00
1c92bc8b35
change location of 'git branch -v'
2013-02-07 16:57:13 -07:00
6321e126bb
Fix typo and move 'git remote rename' location
2013-02-07 16:51:31 -07:00
e6ebf98669
Add git remote rename
2013-02-07 15:45:56 -07:00
5b2906c6d7
add git branch -v explanation
2013-02-07 11:35:37 -07:00
d1c02d6025
Merge pull request #58 from randomecho/readme-tenderly
...
Drop pronoun I in README; Adds Contributing prompt
2013-01-28 13:48:45 -08:00
a728a81d80
Drop pronoun I in README; Adds Contributing prompt
2013-01-28 16:39:38 -05:00
5d37cc7a43
Merge pull request #57 from randomecho/pronoun-wash
...
Remove pronoun I from voice for lack of lone addressor
2013-01-26 20:30:47 -08:00
cdc6f3d506
Remove pronoun I from voice for lack of lone addressor
...
There is no single author listed, the credits are to the
GitHub team, so match up narration to fit that angle.
Pulls it back from single author perspective driving it that
may have existed long ago.
2013-01-26 23:06:41 -05:00
8a8bab3ab2
Merge pull request #56 from zhanghanyun/patch-1
...
Update zh/remotes/index.html
2013-01-23 13:09:55 -08:00
43068cc145
Update zh/remotes/index.html
...
文中有个“可以”重复了
2013-01-23 22:22:22 +08:00
f8c434a2b4
Merge pull request #55 from randomecho/issue-43-delete-remote-branch
...
Adds instructions to delete remote branch
2012-12-31 12:28:36 -08:00
7ad396af14
Includes quick aside on what a refspec is
2012-12-31 15:17:35 -05:00
7da3713a56
Removes superfluous words in remote branch delete tips
2012-12-31 15:12:33 -05:00
d9574958d4
Adds instructions to delete remote branch
...
Syntax to delete remote branch is not the same as a local one.
Introduces the syntax mentioned in the book and
throws in the easier to remember one to boot.
Requested by, fixes #43
References:
- http://git-scm.com/book/en/Git-Branching-Remote-Branches
- http://stackoverflow.com/questions/2003505/delete-remote-branch
2012-12-31 01:13:28 -05:00
7a564d808e
Merge pull request #53 from randomecho/issue-36-stash
...
Basic ropes on git stash command
2012-12-24 22:12:24 -08:00
84c637485d
Merge pull request #54 from randomecho/para-p-da-wrapper-tag
...
Pair up dangling paragraph tags; Make sure all text at least in P
2012-12-24 22:10:32 -08:00
48532993de
Pair up dangling paragraph tags; Make sure all text at least in P
...
Closing P tags are missing or mistyped for another letter.
Other chunks of text need to be wrapped in P tags to fall
inline with rest of page and not run with such wild abandon.
2012-12-22 16:26:33 -05:00
a48fc60d90
Preference git stash apply over pop when first learning
...
Flipped to `apply` over `pop` based on suggestion by
@matthewmccullough. User can then have their Pringles
moment after first trying their hand at repatching in
a way that doesn't make things disappear.
Expanded the goings-on of `git stash list` and the
fact that new items are made into zero, pushing the
rest under.
2012-12-22 10:50:24 -05:00
bf91400618
Basic ropes on git stash command
...
Quick overview on what `git stash` is and some of the basic
commands to run with it.
Going with `git stash pop` as the default means of
extracting from the stack instead of `git stash apply`.
Former feels like the path of least surprise by taking
out what you've just put in.
As requested in #36
2012-12-22 01:06:34 -05:00
eecddb956f
Merge pull request #50 from randomecho/pro-tip-tags
...
Tip about tags not coming down the aisle unless you call for them
2012-12-21 21:52:09 -08:00
68a8475363
Merge pull request #52 from randomecho/issue-5-git-remote-set-url
...
Adding help about updating the remote URLs
2012-12-21 21:50:24 -08:00
34819f5038
For those times you want to update your remotes
...
With a note on the slight difference in yelling between
the use of `git remote set-url` and the sheepish,
silent eater of arguments, `git config remote`.
And that you can have a fetch that isn't at the
same house of your push URL.
On the back of #5
2012-12-21 22:08:54 -05:00
dbdd946cd9
Note difference on default behaviour on fetch/push on repo tags
2012-12-18 18:51:24 -05:00
690a441c25
Tip about tags not coming down the aisle unless you call for them
...
Tags are so incidental they are not normally slurped with the
usual fetch or push commands. A little heads up.
Also adds a nutshell inline with the rest of the cards.
2012-12-18 00:36:22 -05:00
cfb6480f51
Merge pull request #49 from randomecho/issue-42-update-progit-links
...
Update progit and kernel links to git-scm in Chinese translation
2012-12-15 12:38:12 -08:00
58b735e7fc
Update progit, kernel links to git-scm in Chinese translation
2012-12-15 15:28:59 -05:00
d2b7dcee9e
Use example.com instead for illustrative references
2012-12-15 15:27:12 -05:00
4676a83064
Update Site Source link in header to SSL version
2012-12-15 15:22:03 -05:00
574961c472
Merge pull request #48 from randomecho/journey-into-html-entity-island
...
Chevrons in Git outputs disappear if not encoded
2012-12-15 10:15:22 -08:00
300f51758c
Chevrons in Git outputs disappear if not encoded
...
Also added some in to be consistent with expected output
when `git log` is run to show author email addresses inside such.
2012-12-15 11:25:06 -05:00
292167e0de
Merge pull request #47 from randomecho/issue-20-git-reset
...
Drop in two other examples of git reset
2012-12-14 20:37:14 -08:00
9fdf0b2221
Drop in two other examples of git reset
...
Fleshing out what the other two invocations of `git reset`
are and bundle them up.
Information based on the following resources:
http://git-scm.com/2011/07/11/reset.html
http://www.infoq.com/presentations/A-Tale-of-Three-Trees
http://schacon.github.com/resetvcheckout.html
Also updates a link to the book no longer at ProGit.org
2012-12-11 17:20:47 -05:00
aa9f1de00c
Merge pull request #46 from randomecho/linkrot
...
Update progit.org links to git-scm.com book version
2012-12-04 07:04:54 -08:00
3de81653fa
Update progit.org links to git-scm.com book version
...
Quickening event to redirect the links that used to be at progit.org
to their new home at the git-scm.com book section.
Deals with the English language links only.
2012-12-03 22:56:49 -05:00
b4179f8609
Merge pull request #45 from dotnil/gh-pages
...
Use normal you （你） instead of honorific you （您）
2012-11-29 07:20:19 -08:00
338456b8b4
Revert these changes to original
...
stop bragging about yourself, dotnil.
2012-11-29 20:27:14 +08:00
0f4505c1e2
Indent with two spaces in zh files
...
converted tabs to spaces also. but these commits is limited in the zh
version.
the reason I did this:
- long lines is prone to conflict
- the use of tab disturbs the indentation when switching editors
without proper tab space setting, which you may never get it right.
so why not give up and use spaces instead.
those changes is limited to the zh translation.
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages
Conflicts:
.gitignore
_layouts/zh_reference.html
zh/basic/index.html
zh/branching/index.html
zh/creating/index.html
zh/index.html
zh/inspect/index.html
zh/remotes/index.html
2012-11-29 20:16:37 +08:00
b7cefc43bf
Changed 您 to 你
...
do not use the honorific version of `you' in chinese.
indeed that was weird...
2012-11-29 19:29:33 +08:00
b46838f701
Added CC BY-NC-SA 3.0 license.
...
* License added
* Chose Attribution-NonCommercial-ShareAlike 3.0 Unported (CC BY-NC-SA 3.0)
* Desire community to benefit, but not profit off this endeavor
* Fixes #44
2012-11-21 11:02:06 -05:00
8cdd611601
Normalized styles with GitHub.com for code and training.github.com for Sans-Serif
2012-10-01 15:17:55 -06:00
Gergely Polonkai
Tim Berglund
Lazersmoke
Brent Beer
Hiroshige Umino
Robert Djurasaj
Matthew McCullough
Soon Van
zhanghanyun
dotnil