diff options
| author | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2018-01-30 17:02:31 +0100 |
|---|---|---|
| committer | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2018-01-31 08:06:40 +0000 |
| commit | de26df1ee37cc57b7cca79aff5a31d13bbbd2a62 (patch) | |
| tree | 237507d5b550a8bebf4134f1b7f1880a3065fde8 /doc | |
| parent | 61511cd06b584a5c6898b15dd908246863e0209d (diff) | |
Doc: Describe new Git functions
Change-Id: I13704198f707881514cbcd3af2aa7c1d036370a1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/vcs/creator-vcs-git.qdoc | 6 | ||||
| -rw-r--r-- | doc/src/vcs/creator-vcs.qdoc | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/doc/src/vcs/creator-vcs-git.qdoc b/doc/src/vcs/creator-vcs-git.qdoc index 07214d7709..8637f1f4f6 100644 --- a/doc/src/vcs/creator-vcs-git.qdoc +++ b/doc/src/vcs/creator-vcs-git.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -124,10 +124,12 @@ \uicontrol {Fixup Previous Commit}. This operation is done using interactive rebase. In case of conflicts, a merge tool is suggested. + To recover removed files, select \uicontrol Tools > \uicontrol Git > + \uicontrol {Recover Deleted Files}. + To change a series of commits in the local repository, select \uicontrol Tools > \uicontrol Git > \uicontrol {Local Repository} > \uicontrol {Interactive Rebase}. You can reorder or discard commits, squash - them into a single commit, or edit the commit messages. The following sections describe how to manage local and remote branches, apply patches, and use stashes. diff --git a/doc/src/vcs/creator-vcs.qdoc b/doc/src/vcs/creator-vcs.qdoc index 29784b109a..31dc3c14c6 100644 --- a/doc/src/vcs/creator-vcs.qdoc +++ b/doc/src/vcs/creator-vcs.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -234,6 +234,9 @@ show annotation views of previous versions (see \l{Annotating Files}). With Git you can also choose to cherry-pick or revert a change. + With Git, you can click \inlineimage reload_gray.png + (\uicontrol Reload) to rescan the files. + \section2 Annotating Files Annotation views are obtained by selecting \uicontrol{Annotate} or \uicontrol{Blame}. @@ -250,6 +253,9 @@ The same context menu is available when right-clicking on a version identifier in the file log view of a single file. + With Git, you can click \inlineimage reload_gray.png + (\uicontrol Reload) to rescan the files. + \section2 Committing Changes Once you have finished making changes, submit them to the version control |