|
|
|
@ -66,6 +66,16 @@ Aliases
@@ -66,6 +66,16 @@ Aliases
|
|
|
|
|
- `gcs` displays various types of objects. |
|
|
|
|
- `gcl` displays lost commits. |
|
|
|
|
|
|
|
|
|
### Conflict |
|
|
|
|
|
|
|
|
|
- `gCl` lists unmerged files. |
|
|
|
|
- `gCa` adds unmerged file contents to the index. |
|
|
|
|
- `gCe` executes merge-tool on all unmerged file. |
|
|
|
|
- `gCo` checks out our changes for unmerged paths. |
|
|
|
|
- `gCO` checks out our changes for all unmerged paths. |
|
|
|
|
- `gCt` checks out their changes for unmerged paths. |
|
|
|
|
- `gCT` checks out their changes for all unmerged paths. |
|
|
|
|
|
|
|
|
|
### Data |
|
|
|
|
|
|
|
|
|
- `gd` displays information about files in the index and the work tree. |
|
|
|
@ -104,16 +114,6 @@ Aliases
@@ -104,16 +114,6 @@ Aliases
|
|
|
|
|
- `gix` removes files/directories from the index (recursively). |
|
|
|
|
- `giX` removes files/directories from the index (recursively and forced). |
|
|
|
|
|
|
|
|
|
### Conflict |
|
|
|
|
|
|
|
|
|
- `gCl` lists unmerged files. |
|
|
|
|
- `gCa` adds unmerged file contents to the index. |
|
|
|
|
- `gCe` executes merge-tool on all unmerged file. |
|
|
|
|
- `gCo` checks out our changes for unmerged paths. |
|
|
|
|
- `gCO` checks out our changes for all unmerged paths. |
|
|
|
|
- `gCt` checks out their changes for unmerged paths. |
|
|
|
|
- `gCT` checks out their changes for all unmerged paths. |
|
|
|
|
|
|
|
|
|
### Log |
|
|
|
|
|
|
|
|
|
- `gl` displays the log. |
|
|
|
|