Skip to content

Conversation

larsxschneider
Copy link
Contributor

No description provided.


Git beginners are easily confused by the distributed nature of Git.
One source of confusion are Git remotes, especially if there are
multiple ones. This is a potentially big thread to cooperations
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

potentially big threat to cooperations

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed. thanks :)

Lars Schneider added 7 commits February 19, 2016 09:46
* move beginners mode and remote white/blacklist to projects
* split up CI microprojects
…tch3

# By Matthieu Moy (3) and Paul Tan (2)
# Via Matthieu Moy
* 'master' of https://github.com/git/git.github.io:
  SoC: adapt application text to characters limit
  SoC: clarify situation wrt libgit2
  SoC: horizontal logo with name (recommended format for GSoC now)
  SoC/Microprojects: add "teach git pull the --[no-]autostash option"
  SoC/Microprojects: add configuration option for git commit -v

Conflicts:
	SoC-2016-Microprojects.md
@larsxschneider
Copy link
Contributor Author

@moy Updated according to your suggestions! The commits are a bit messy. Let me know if you prefer a clean history in this repo then I will rebase them. 😄

@moy moy closed this in 6b8b5e1 Feb 19, 2016
@moy
Copy link
Contributor

moy commented Feb 19, 2016

I slightly prefer a clean history, but this page is intermediate between a clean repo and a wiki so I don't mind too much. I had to fix a merge conflict anyway, so I did a merge --squash.

moy added a commit that referenced this pull request Feb 19, 2016
…improvements project

This is a squashed merge of several commits by Lars Schneider
<larsxschneider@gmail.com>.

Closes #125.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants