alvaro/git-flight-rules
1
0
Fork 0
mirror of https://github.com/k88hudson/git-flight-rules.git synced 2025-06-17 05:21:35 -03:00
Code Issues Releases Wiki Activity

Clean up READMEs (#198)

Browse Source 
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
This commit is contained in:
Gabriel Caruso
2018-01-01 15:40:52 -02:00
committed by Richard Littauer
parent 590f63c7e6
commit f9792e9c68
4 changed files with 2 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
README.md
View File

@ -111,7 +111,6 @@ For clarity's sake all examples in this document use a customized bash prompt in
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
## Editing Commits
<a name="diff-last"></a>
@ -168,7 +167,6 @@ $ git commit --amend --reset-author --no-edit
If you need to change all of history, see the man page for `git filter-branch`.
<a href="#i-want-to-remove-a-file-from-the-previous-commit"></a>
### I want to remove a file from the previous commit
@ -290,13 +288,11 @@ $ git add -N filename.x
Then, you will need to use the `e` option to manually choose which lines to add. Running `git diff --cached` or
`git diff --staged` will show you which lines you have staged compared to which are still saved locally.
<a href="stage-in-two-commits"></a>
### I want to add changes in one file to two different commits
`git add` will add the entire file to a commit. `git add -p` will allow to interactively select which changes you want to add.
<a href="unstaging-edits-and-staging-the-unstaged"></a>
### I want to stage my unstaged edits, and unstage my staged edits
@ -459,7 +455,6 @@ $ git branch -a
$ git checkout -b <branch> <SHA1_OF_COMMIT>
```
<a name="pull-wrong-branch"></a>
### I pulled from/into the wrong branch
@ -622,7 +617,6 @@ Now, let's *cherry-pick* the commit for bug #21 on top of our branch. That means
At this point, there is a possibility there might be conflicts. See the [**There were conflicts**](#merge-conflict) section in the [interactive rebasing section above](#interactive-rebase) for how to resolve conflicts.
Now let's create a new branch for bug #14, also based on master
```sh
@ -637,7 +631,6 @@ And finally, let's cherry-pick the commit for bug #14:
(14)$ git cherry-pick 5ea5173
```
<a name="delete-stale-local-branches"></a>
### I want to delete local branches that were deleted upstream
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.
@ -1182,7 +1175,6 @@ Keep in mind that author and committer are not the same. The `--author` is the p
To find all commits containing a specific file you can use:
```sh
$ git log -- <path to file>
```
@ -1438,7 +1430,6 @@ Using `git reset` it is then possible to change master back to the commit it was
(copied and edited from [Source](https://www.atlassian.com/git/tutorials/rewriting-history/git-reflog)).
# Other Resources
## Books