summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorKavindra Palaraja <qtc-committer@nokia.com>2009-01-15 15:57:07 +0100
committerKavindra Palaraja <qtc-committer@nokia.com>2009-01-15 15:57:07 +0100
commit7bd00510c1ee418ed61b80c08064d8e558ab7ac7 (patch)
tree4aac459cb83edb0b12de546e33ea55229b1f0db7 /doc
parentf5ab36c15690c2b4bbdb73f00c2e6201faacdc54 (diff)
downloadqt-creator-7bd00510c1ee418ed61b80c08064d8e558ab7ac7.tar.gz
Fixes: Documentation - screenshtos and last bits for VCS
Details: Screenshots are not scaled yet.
Diffstat (limited to 'doc')
-rw-r--r--doc/qtcreator-vcs-annotate.pngbin0 -> 263380 bytes
-rw-r--r--doc/qtcreator-vcs-commit.pngbin0 -> 136675 bytes
-rw-r--r--doc/qtcreator-vcs-describe.pngbin0 -> 200614 bytes
-rw-r--r--doc/qtcreator-vcs-diff.pngbin0 -> 194103 bytes
-rw-r--r--doc/qtcreator-vcs-gitbranch.pngbin0 -> 38666 bytes
-rw-r--r--doc/qtcreator-vcs-log.pngbin0 -> 173623 bytes
-rw-r--r--doc/qtcreator-vcs-pane.pngbin0 -> 26015 bytes
-rw-r--r--doc/qtcreator.qdoc14
8 files changed, 12 insertions, 2 deletions
diff --git a/doc/qtcreator-vcs-annotate.png b/doc/qtcreator-vcs-annotate.png
new file mode 100644
index 0000000000..87b7ed1173
--- /dev/null
+++ b/doc/qtcreator-vcs-annotate.png
Binary files differ
diff --git a/doc/qtcreator-vcs-commit.png b/doc/qtcreator-vcs-commit.png
new file mode 100644
index 0000000000..2c58ad5773
--- /dev/null
+++ b/doc/qtcreator-vcs-commit.png
Binary files differ
diff --git a/doc/qtcreator-vcs-describe.png b/doc/qtcreator-vcs-describe.png
new file mode 100644
index 0000000000..d0949b1e59
--- /dev/null
+++ b/doc/qtcreator-vcs-describe.png
Binary files differ
diff --git a/doc/qtcreator-vcs-diff.png b/doc/qtcreator-vcs-diff.png
new file mode 100644
index 0000000000..fdb9a0f5da
--- /dev/null
+++ b/doc/qtcreator-vcs-diff.png
Binary files differ
diff --git a/doc/qtcreator-vcs-gitbranch.png b/doc/qtcreator-vcs-gitbranch.png
new file mode 100644
index 0000000000..398de10ee6
--- /dev/null
+++ b/doc/qtcreator-vcs-gitbranch.png
Binary files differ
diff --git a/doc/qtcreator-vcs-log.png b/doc/qtcreator-vcs-log.png
new file mode 100644
index 0000000000..e74cd3dade
--- /dev/null
+++ b/doc/qtcreator-vcs-log.png
Binary files differ
diff --git a/doc/qtcreator-vcs-pane.png b/doc/qtcreator-vcs-pane.png
new file mode 100644
index 0000000000..faea0cf32e
--- /dev/null
+++ b/doc/qtcreator-vcs-pane.png
Binary files differ
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index c8125fabd8..92c01dd171 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -881,8 +881,18 @@
\i \gui{Stash}
\i Stash local changes prior to executing a \bold{pull}.
\row
- \i
- \i
+ \i \gui{Pull}
+ \i Pull changes from the remote repository. If there are locally
+ modified files, you will be prompted to stash those changes.
+ \row
+ \i \gui{Branches...}
+ \i Displays the branch dialog showing the local branches at the
+ top and remote branches at the bottom. To switch to the local
+ branch, simply double-click on it. Double-clicking on a remote
+ branch will first create a local branch with the same name that
+ tracks the remote branch, and then switch to it.
+
+ \image qtcreator-vcs-gitbranch.png
\endtable
*/