New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split "Exploring history" in two topics #212

Open
iglpdc opened this Issue Jan 29, 2016 · 3 comments

Comments

Projects
None yet
2 participants
@iglpdc
Contributor

iglpdc commented Jan 29, 2016

This follows up from #205. First, the title of the topic is a bit confusing: first thing coming to my mind is the topic is about git log. Second, we should mention git diff --cached. I think it's good practive to use before git commit when the commit is not trivial. Third, we motivate the use of a VCS for its great "undo" features, so I think we should give the topic a more prominent place in the lesson.

My proposal is split "Exploring history" in two topics. One topic would be about git diff and the different formats for commit IDs and including git diff --cached. We can called this "Comparing different versions". The other topic would be about how to undo mistakes recovering from changes that you saved but not staged, saved and staged, saved and committed. We can called this "Undoing mistakes". This would address in the more basic parts of #179.

@iglpdc iglpdc self-assigned this Jan 29, 2016

@amueller

This comment has been minimized.

Contributor

amueller commented Feb 3, 2016

+1! In particular when combined with checkout I think the cached option is important (otherwise you can't see the changes done by checking out a file).

@iglpdc iglpdc added the enhancement label Jun 6, 2016

@iglpdc iglpdc added this to the Version 5.4 milestone Jun 6, 2016

@iglpdc

This comment has been minimized.

Contributor

iglpdc commented Jun 14, 2016

I'm closing #88, but adding it here as a reference: the rewrite of this topic has to take #88 into account.

@iglpdc

This comment has been minimized.

Contributor

iglpdc commented Jun 14, 2016

Same for #179: take it into account when rewriting this topic.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment