diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-03-14 11:19:26 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-03-14 11:19:26 +0000 |
| commit | 103ad7fa163b20b6629d6162e5b261a124e1e486 (patch) | |
| tree | 4d3a9d38b101f57e14b36af1aa2c0190e16687a5 /cmds-ancillarymanipulators.txt | |
| parent | c51fede9f2fdd66e06416d7865b023924b52e659 (diff) | |
| download | git-htmldocs-103ad7fa163b20b6629d6162e5b261a124e1e486.tar.gz | |
Autogenerated HTML docs for v1.5.0.3-438-gc49b2
Diffstat (limited to 'cmds-ancillarymanipulators.txt')
| -rw-r--r-- | cmds-ancillarymanipulators.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmds-ancillarymanipulators.txt b/cmds-ancillarymanipulators.txt index 56d388ef7..28d44fa99 100644 --- a/cmds-ancillarymanipulators.txt +++ b/cmds-ancillarymanipulators.txt @@ -7,6 +7,9 @@ gitlink:git-fast-import[1]:: gitlink:git-lost-found[1]:: Recover lost refs that luckily have not yet been pruned. +gitlink:git-mergetool[1]:: + Run merge conflict resolution tools to resolve merge conflicts. + gitlink:git-pack-refs[1]:: Pack heads and tags for efficient repository access. |