dcarrillo/prezto
1
0
Fork 0
mirror of https://github.com/dcarrillo/prezto.git synced 2025-11-30 08:04:08 +00:00
Code Issues Releases Wiki Activity

Sort Git conflict aliases

Browse Source
This commit is contained in:
Sorin Ionescu
2013-04-25 00:19:33 -04:00
parent 4e3475d8a7
commit 05a6653284
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/git/README.md
View File

@@ -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
- `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.