Skip to content

Chapter 3 polish #43

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.

Sign up for GitHub

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

Merged
merged 16 commits into from
Jun 10, 2014
Merged

Chapter 3 polish #43

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
20a5091
Edits
ben Jun 4, 2014
8a15710
Update graphics and re-export at 300dpi
ben Jun 4, 2014
e452200
Merge remote-tracking branch 'origin/master' into chapter-3-polish
ben Jun 4, 2014
b065269
add some command line examples
schacon Jun 9, 2014
eba3784
Merge remote-tracking branch 'origin/master' into chapter-3-polish
schacon Jun 9, 2014
2aa4b2f
small changes
schacon Jun 9, 2014
199901d
move undoing merges to ch7
schacon Jun 9, 2014
0bc490b
add some references to ch5 and ch7
schacon Jun 9, 2014
b5676f5
add to upstream and add a short pulling section
schacon Jun 9, 2014
179c999
origin is not special admonition
schacon Jun 9, 2014
b4ac3fa
don't encourage people to force push ever
schacon Jun 9, 2014
0e152e4
we have --delete now
schacon Jun 9, 2014
4fc35b7
various smaller changes and syntax
schacon Jun 9, 2014
32afb1d
add git branch -vv info for inspecting tracking branches
schacon Jun 9, 2014
e4be552
Leetle punctuations
ben Jun 10, 2014
79dbb50
link directly to the section
schacon Jun 10, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/master' into chapter-3-polish 
Conflicts:
	book/03-git-branching/1-git-branching.asc
  • Loading branch information
@schacon
schacon committed Jun 9, 2014
commit eba3784fdb3efd40b46e4affb0a68a5f5d31c659

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.