mirror of
https://github.com/godotengine/godot-docs.git
synced 2026-01-04 14:11:02 +03:00
classref: Sync with current master branch (c64afeb)
This commit is contained in:
@@ -265,7 +265,7 @@ Discards the changes made in a file present at ``file_path``.
|
||||
|
||||
void **_fetch** **(** :ref:`String<class_String>` remote **)** |virtual|
|
||||
|
||||
Fetches new changes from the remote, but doesn't write changes to the current working directory. Equivalent to ``git fetch``.
|
||||
Fetches new changes from the ``remote``, but doesn't write changes to the current working directory. Equivalent to ``git fetch``.
|
||||
|
||||
.. rst-class:: classref-item-separator
|
||||
|
||||
@@ -397,7 +397,7 @@ Pulls changes from the remote. This can give rise to merge conflicts.
|
||||
|
||||
void **_push** **(** :ref:`String<class_String>` remote, :ref:`bool<class_bool>` force **)** |virtual|
|
||||
|
||||
Pushes changes to the ``remote``. Optionally, if ``force`` is set to true, a force push will override the change history already present on the remote.
|
||||
Pushes changes to the ``remote``. If ``force`` is ``true``, a force push will override the change history already present on the remote.
|
||||
|
||||
.. rst-class:: classref-item-separator
|
||||
|
||||
@@ -517,7 +517,7 @@ Helper function to create a commit :ref:`Dictionary<class_Dictionary>` item. ``m
|
||||
|
||||
:ref:`Dictionary<class_Dictionary>` **create_diff_file** **(** :ref:`String<class_String>` new_file, :ref:`String<class_String>` old_file **)**
|
||||
|
||||
Helper function to create a ``Dictionary`` for storing old and new diff file paths.
|
||||
Helper function to create a :ref:`Dictionary<class_Dictionary>` for storing old and new diff file paths.
|
||||
|
||||
.. rst-class:: classref-item-separator
|
||||
|
||||
@@ -529,7 +529,7 @@ Helper function to create a ``Dictionary`` for storing old and new diff file pat
|
||||
|
||||
:ref:`Dictionary<class_Dictionary>` **create_diff_hunk** **(** :ref:`int<class_int>` old_start, :ref:`int<class_int>` new_start, :ref:`int<class_int>` old_lines, :ref:`int<class_int>` new_lines **)**
|
||||
|
||||
Helper function to create a ``Dictionary`` for storing diff hunk data. ``old_start`` is the starting line number in old file. ``new_start`` is the starting line number in new file. ``old_lines`` is the number of lines in the old file. ``new_lines`` is the number of lines in the new file.
|
||||
Helper function to create a :ref:`Dictionary<class_Dictionary>` for storing diff hunk data. ``old_start`` is the starting line number in old file. ``new_start`` is the starting line number in new file. ``old_lines`` is the number of lines in the old file. ``new_lines`` is the number of lines in the new file.
|
||||
|
||||
.. rst-class:: classref-item-separator
|
||||
|
||||
@@ -541,7 +541,7 @@ Helper function to create a ``Dictionary`` for storing diff hunk data. ``old_sta
|
||||
|
||||
:ref:`Dictionary<class_Dictionary>` **create_diff_line** **(** :ref:`int<class_int>` new_line_no, :ref:`int<class_int>` old_line_no, :ref:`String<class_String>` content, :ref:`String<class_String>` status **)**
|
||||
|
||||
Helper function to create a ``Dictionary`` for storing a line diff. ``new_line_no`` is the line number in the new file (can be ``-1`` if the line is deleted). ``old_line_no`` is the line number in the old file (can be ``-1`` if the line is added). ``content`` is the diff text. ``status`` is a single character string which stores the line origin.
|
||||
Helper function to create a :ref:`Dictionary<class_Dictionary>` for storing a line diff. ``new_line_no`` is the line number in the new file (can be ``-1`` if the line is deleted). ``old_line_no`` is the line number in the old file (can be ``-1`` if the line is added). ``content`` is the diff text. ``status`` is a single character string which stores the line origin.
|
||||
|
||||
.. rst-class:: classref-item-separator
|
||||
|
||||
@@ -553,7 +553,7 @@ Helper function to create a ``Dictionary`` for storing a line diff. ``new_line_n
|
||||
|
||||
:ref:`Dictionary<class_Dictionary>` **create_status_file** **(** :ref:`String<class_String>` file_path, :ref:`ChangeType<enum_EditorVCSInterface_ChangeType>` change_type, :ref:`TreeArea<enum_EditorVCSInterface_TreeArea>` area **)**
|
||||
|
||||
Helper function to create a ``Dictionary`` used by editor to read the status of a file.
|
||||
Helper function to create a :ref:`Dictionary<class_Dictionary>` used by editor to read the status of a file.
|
||||
|
||||
.. rst-class:: classref-item-separator
|
||||
|
||||
|
||||
Reference in New Issue
Block a user