mirror of
https://github.com/k88hudson/git-flight-rules.git
synced 2025-03-10 12:48:43 -03:00
* Adding submodule section * Add the rest of the commands
This commit is contained in:
parent
da44b4d6c1
commit
f462bad54d
39
README.md
39
README.md
@ -80,12 +80,15 @@ For clarity's sake all examples in this document use a customized bash prompt in
|
||||
- [Finding](#finding)
|
||||
- [I want to find a string in any commit](#i-want-to-find-a-string-in-any-commit)
|
||||
- [I want to find by author/committer](#i-want-to-find-by-authorcommitter)
|
||||
- [Miscellaneous Objects](#miscellaneous-objects)
|
||||
- [Submodules](#submodules)
|
||||
- [Clone all submodules](#clone-all-submodules)
|
||||
- [Remove a submodule](#remove-a-submodule)
|
||||
- [Miscellaneous Objects](#miscellaneous-objects)
|
||||
- [Restore a deleted file](#restore-a-deleted-file)
|
||||
- [Delete tag](#delete-tag)
|
||||
- [Recover a deleted tag](#recover-a-deleted-tag)
|
||||
- [Deleted Patch](#deleted-patch)
|
||||
- [Exporting a repository as a Zip file](#exporting-a-repository-as-a-zip-file)
|
||||
- [Tracking Files](#tracking-files)
|
||||
- [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 overwrite local files when doing a git pull](#i-want-to-overwrite-local-files-when-doing-a-git-pull)
|
||||
@ -117,12 +120,18 @@ Let's say that you just blindly committed changes with `git commit -a` and you'r
|
||||
(master)$ git show
|
||||
```
|
||||
|
||||
or
|
||||
Or
|
||||
|
||||
```sh
|
||||
$ git log -n1 -p
|
||||
```
|
||||
|
||||
If you want to see a file at a specific commit, you can also do this (where `<commitid>` is the commit you're interested in):
|
||||
|
||||
```sh
|
||||
$ git show <commitid>:filename
|
||||
```
|
||||
|
||||
<a name="#i-wrote-the-wrong-thing-in-a-commit-message"></a>
|
||||
### I wrote the wrong thing in a commit message
|
||||
|
||||
@ -1156,8 +1165,7 @@ $ git log --committer=<name or email>
|
||||
|
||||
Keep in mind that author and committer are not the same. The `--author` is the person who originally wrote the code; on the other hand, the `--committer`, is the person who committed the code on behalf of the original author.
|
||||
|
||||
<a name="miscellaneous-objects"></a>
|
||||
## Miscellaneous Objects
|
||||
## Submodules
|
||||
|
||||
<a name="clone-submodules"></a>
|
||||
### Clone all submodules
|
||||
@ -1184,6 +1192,23 @@ $ git rm --cached submodulename
|
||||
$ rm -rf .git/modules/submodulename
|
||||
```
|
||||
|
||||
<a name="miscellaneous-objects"></a>
|
||||
## Miscellaneous Objects
|
||||
|
||||
### Restore a deleted file
|
||||
|
||||
First find the commit when the file last existed:
|
||||
|
||||
```sh
|
||||
$ git rev-list -n 1 HEAD -- filename
|
||||
```
|
||||
|
||||
Then checkout that file:
|
||||
|
||||
```
|
||||
git checkout deletingcommitid^ -- filename
|
||||
```
|
||||
|
||||
<a name="delete-tag"></a>
|
||||
### Delete tag
|
||||
|
||||
@ -1220,6 +1245,12 @@ From github.com:foo/bar
|
||||
* [new ref] refs/pull/1/head -> pr_1
|
||||
```
|
||||
|
||||
### Exporting a repository as a Zip file
|
||||
|
||||
```sh
|
||||
$ git archive --format zip --output /full/path/to/zipfile.zip master
|
||||
```
|
||||
|
||||
## Tracking Files
|
||||
|
||||
<a href="i-want-to-change-a-file-names-capitalization-without-changing-the-contents-of-the-file"></a>
|
||||
|
Loading…
x
Reference in New Issue
Block a user