alvaro/git-flight-rules
1
0
Fork 0
mirror of https://github.com/k88hudson/git-flight-rules.git synced 2025-03-10 12:48:43 -03:00
Code Issues Releases Wiki Activity

Added workflow for removing file from commit

Browse Source
This commit is contained in:
Richard Littauer 2015-09-23 11:26:28 -04:00
parent 3c736dfa26
commit 1edbba171b
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
README.md
View File

@ -45,6 +45,7 @@ For clarity's sake all examples in this document use a customized bash prompt in
- [What did I just do?](#what-did-i-just-do) - [What did I just do?](#what-did-i-just-do)
- [I want to add changes in one file to two different commits](#i-want-to-add-changes-in-one-file-to-two-different-commits) - [I want to add changes in one file to two different commits](#i-want-to-add-changes-in-one-file-to-two-different-commits)
- [I want to remove a file from git but keep the file](#i-want-to-remove-a-file-from-git-but-keep-the-file) - [I want to remove a file from git but keep the file](#i-want-to-remove-a-file-from-git-but-keep-the-file)
- [I want to remove a file from a commit](#i-want-to-remove-a-file-from-a-commit)
- [I want to change a file name's capitalization, without changing the contents of the file.](#i-want-to-change-a-file-names-capitalization-without-changing-the-contents-of-the-file) - [I want to change a file name's capitalization, without changing the contents of the file.](#i-want-to-change-a-file-names-capitalization-without-changing-the-contents-of-the-file)
- [Clone all submodules](#clone-all-submodules) - [Clone all submodules](#clone-all-submodules)
- [Deleting Objects](#deleting-objects) - [Deleting Objects](#deleting-objects)
@ -569,6 +570,19 @@ Let's say that you just blindly committed changes with `git commit -a` and you'r
(master)$ git rm --cached log.txt (master)$ git rm --cached log.txt
``` ```
<a href="#i-want-to-remove-a-file-from-a-commit"></a>
## I want to remove a file from a commit
In order to remove a file from a commit, do the following:
```sh
$ git checkout HEAD~2 myfile
$ git add -A
$ git commit --amend
```
This is particularly useful when you have an open patch and you have commited an unnecessary file, and need to force push to update the patch on a remote.
<a href="i-want-to-change-a-file-names-capitalization-without-changing-the-contents-of-the-file"></a> <a href="i-want-to-change-a-file-names-capitalization-without-changing-the-contents-of-the-file"></a>
## I want to change a file name's capitalization, without changing the contents of the file. ## I want to change a file name's capitalization, without changing the contents of the file.