From 49c905b941b22954aa94c80894869d3287e6656a Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 29 Oct 2019 11:41:15 +0100 Subject: [PATCH] Doc: Update information about Git Describe viewing tags and old information in the Git Branches sidebar view and the Archive action in the Actions in Commits dialog. Change-Id: I3c4c5b3ccc91657875d7ec9d14432d4ac88edd19 Reviewed-by: Orgad Shaneh --- doc/images/qtcreator-git-commit-actions.png | Bin 0 -> 13722 bytes doc/images/qtcreator-vcs-gitbranch.png | Bin 3991 -> 6812 bytes doc/src/vcs/creator-vcs-git.qdoc | 44 ++++++++++++++++---- 3 files changed, 36 insertions(+), 8 deletions(-) create mode 100644 doc/images/qtcreator-git-commit-actions.png diff --git a/doc/images/qtcreator-git-commit-actions.png b/doc/images/qtcreator-git-commit-actions.png new file mode 100644 index 0000000000000000000000000000000000000000..37295e48fca42b095b6c321104dfd4463b8374ce GIT binary patch literal 13722 zcmeAS@N?(olHy`uVBq!ia0y~yVA5bEaktaqI2ezmsK- zSKj|xzu}0vbc0N|CyS<-ZUc+MgSZc6>=V=+8(I_|u9Nx5w@S!ai>Y;zR=XB6r_Rj< zGa^{SLaGn7nsA0C7gPnEBn3)XF4zI^_?dH?*rfBCW}{dnJ81_tJo_X{VVK7HC>WZRyaPaoc_5qy5( zq{^Qs7bmA~c{=$x-&w1d8G@Ty`sD7dUS4qJ#?u0+vYc!44X4Jv(9F5mxm*Z%(t|GHmm`|JPrT$;hYZ+FF8_5W}4|G(62y%kV@ z>d@zBr_Vq6_G$Jf$B-WJ`2U6W-Y<@?-ye~pWFI0FR2`7JeP5b^ma#-zqH~H@!oSDU z_oZa^OWfG_;m(&s*Jj7>_3*xVU()Vxm!J3db34mJ&skTT^6UQmdY%7G&t~rGDL2>b|G8;t{XCZ7iz^pZ z8Q)*?HNM%9=kTw^wi8zgtJ>@@DE)2z@A~TaKXtEb<9Gg^XFscc&EJ{(e;t>%`DOp_ zYklo+>GU*vQ@6_2ZrxhHscBWBwYS)w z$CYucC;47^8Z5BB^&whN+4t31n;6zK6AmB{Lpoo&Umb%UWn{$8@MU@y3gl zexIFlPd;h-Hhurk$?wn9{XMaN$F9FW<^P?luYdmacKof{ht>Y|@6+pdzJJYs_uKF4 zZ}q2*cOJ;y!W{MJpNOVSsLA%#Nk{v0UfZ4mCqBzn%KvUo{-9y^f6EVfpdYvQxBcI*-C6;@%m2Oe|Nkid-%a)RzpuH^?K|<>)i|opXQzMd zm$dK~8?Nwgotk)QPfBrBR7v#wvW0UZbFT%={@la$@Ss7CQs{E!x1B=sCf%+}|1SS; zzWvX;`~M%)|MUFqHUF;o|M$e7e!FcQdq5^jxUTB@T=NP4bHBKsI&QAN|4&kd!nvw> z@4YXaJk!0aA_?`Buk8C(etw>9adGkI9Qa$>HB*8 zTHzf0K2tvEtlxTl+U5zLvpxT(TXqMOv`_o`!?QwaQjV&0=n<`^f8Q@~pLf#E-z*-r zmi29ajdE_`=GlK*7j?#GF0G$-cJC|MmFq6Guh#RHT6o9Zf63i#B8Prup7L5^v10FM zr`2z&b!OPJ8_oF__T_O1S7w%*{dsj8V^6KiLD4tY9h&U-C`mHTYO2|?P!B2lpPO^e zuAa8nOOf+R@QjN!b1v5FKHBdud?HDIujct}lk3ByUq9QIckkNyWvbVl*ZIxvjA*~` zd1m_z&(M$EchBlD^7Marb9;M!_L8&nFSp%VH+S}V=WEk8&7Xd)>#d5#%^<~-|F6u? zJ~i!P(F)%yPSuJ}{@o<(cP}P= z_lc>c8P{t!2ES07>Z!T7z@YBXO63eEy-yriV^CL|=

rOj%g*BUdy4Y( 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 literal 0 HcmV?d00001 diff --git a/doc/images/qtcreator-vcs-gitbranch.png b/doc/images/qtcreator-vcs-gitbranch.png index aae80201bca059d676fdd744c09804bc8239802f..f6a5586eac207f7f4b873f9bee634ee64fdd983f 100644 GIT binary patch literal 6812 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 diff --git a/doc/src/vcs/creator-vcs-git.qdoc b/doc/src/vcs/creator-vcs-git.qdoc index 8705df4939e..ec6b1a2ebe0 100644 --- a/doc/src/vcs/creator-vcs-git.qdoc +++ b/doc/src/vcs/creator-vcs-git.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -224,6 +224,13 @@ branch is shown in bold and underlined in the list of branches in the \uicontrol {Git Branches} sidebar view. + \image qtcreator-vcs-gitbranch.png "Git Branches sidebar view" + + Old entries and tags are filtered out of the list of branches + by default. To include them, select \inlineimage filtericon.png + (\uicontrol {Filter Tree}), and then select + \uicontrol {Include Old Entries} and \uicontrol {Include Tags}. + If you checked out a specific commit, the list of branches displays a \e {Detached HEAD} entry. @@ -233,8 +240,6 @@ To refresh the list of branches, click \inlineimage reload_gray.png (\uicontrol Refresh). - \image qtcreator-vcs-gitbranch.png "Git Branches sidebar view" - The following operations are supported in the context-menu for a branch: \table @@ -249,7 +254,8 @@ \li Remove a local branch. You cannot delete remote branches. \row \li \uicontrol Rename - \li Rename a local branch. You cannot rename remote branches. + \li Rename a local branch or a tag. You cannot rename remote + branches. \row \li \uicontrol{Checkout} \li Check out the selected branch and make it current. You can stash @@ -302,12 +308,12 @@ \li Description \row \li \uicontrol{Fetch} - \li Fetches all the branches and changes information from a + \li Fetch all the branches and changes information from a specific remote repository, or from all remotes if applied to \uicontrol {Remote Branches}. \row \li \uicontrol{Manage Remotes} - \li Opens the \uicontrol Remotes dialog. + \li Open the \uicontrol Remotes dialog. \endtable \section3 Configuring Merge Tools @@ -357,11 +363,33 @@ To browse a directory or the commit history and to apply actions on the commits, select \uicontrol Tools > \uicontrol Git > - \uicontrol {Actions on Commits}. You can checkout, revert, or cherry-pick - commits or view them in the diff editor. + \uicontrol {Actions on Commits}. \image creator-git-commit-actions.png "Select a Git Commit dialog" + You can apply the following actions on commits: + + \table + \header + \li Menu Item + \li Description + \row + \li \uicontrol Archive + \li Package the commit as a ZIP or tarball. + \row + \li \uicontrol Checkout + \li Check out the change in a headless state. + \row + \li \uicontrol {Cherry Pick} + \li Cherry-pick the selected change to the local repository. + \row + \li \uicontrol Revert + \li Revert back to the state of the last commit. + \row + \li \uicontrol Show + \li Show the commit in the diff editor. + \endtable + \section1 Initializing Git Repositories To start controlling a project directory that is currently not under