Skip to content
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

A few cleanups #163

Merged
merged 17 commits into from
Dec 8, 2017
Merged

A few cleanups #163

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4e2d135
Consolidate the name of the subsystem
sivaraam Dec 4, 2017
43ae80e
Consolidate the name of GitHub
sivaraam Dec 4, 2017
be8bb4b
Avoid fullstops in section names
sivaraam Dec 4, 2017
6c64e0f
Update the ToC
sivaraam Dec 4, 2017
f19a94c
Quote the git commands correctly
sivaraam Dec 4, 2017
d1fa7e3
Clarify that the changes are removed only for the previous commit
sivaraam Dec 4, 2017
e16f9f8
Showcase the flexibility of `git fetch -p`
sivaraam Dec 4, 2017
d5d7508
Exemplify the safer version of branch deletion
sivaraam Dec 4, 2017
ed04605
Improve readability of a few phrases
sivaraam Dec 4, 2017
b824580
Use HTTPS links for sites that serve using HTTPS
sivaraam Dec 4, 2017
ab1d0b7
Clarify that rebasing just re-writes history
sivaraam Dec 4, 2017
ce61b09
Attribute both the authors of the second edition of Pro Git
sivaraam Dec 4, 2017
8fb8200
Try a different form of emphasizing text
sivaraam Dec 6, 2017
50a5eea
Mention what 'upstream' means for the sake of clarity
sivaraam Dec 6, 2017
ab4a4d7
Simplify the way to create a remote branch from the local one
sivaraam Dec 6, 2017
3765a67
Remove a character cruft left over while editing
sivaraam Dec 8, 2017
e2f230a
Improve a sentence
sivaraam Dec 8, 2017
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
Showcase the flexibility of git fetch -p 
The example for that exhibits the way to 'prune' remote branches that
were deleted upstream wasn't flexible as it relied on the command
defaulting to the upstream of the current branch. This might lead
the reader into overlooking the flexibility of the `git fetch`.

Show that the 'upstream' can be mentioned in the command thus show
casing the flexibility of `git fetch`.
  • Loading branch information
@sivaraam
sivaraam committed Dec 4, 2017
commit e16f9f87d46541cd96a266fc245c104d1c84aae0
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ And finally, let's cherry-pick the commit for bug #14:
Once you merge a pull request on GitHub, it gives you the option to delete the merged branch in your fork. If you aren't planning to keep working on the branch, it's cleaner to delete the local copies of the branch so you don't end up cluttering up your working checkout with a lot of stale branches.

```sh
$ git fetch -p
$ git fetch -p upstream
Copy link
Collaborator

Choose a reason for hiding this comment

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

We should add a note saying to check that upstream is the remote you want to fetch from.

```

<a name='restore-a-deleted-branch'></a>
Expand Down