Working with Git - Revision history

Patrick87: /* Git commands for the novice */ add autostash

2020-05-15T16:52:49Z

Git commands for the novice: add autostash

← Older revision		Revision as of 16:52, 15 May 2020
Line 7:		Line 7:
	* <code>git submodule update --init --recursive</code> — Initialize submodules in your local repo (yes, inkscape has submodules since the 1.0 release)		* <code>git submodule update --init --recursive</code> — Initialize submodules in your local repo (yes, inkscape has submodules since the 1.0 release)
	* <code>git pull --recurse-submodules</code> — Updates local repository including all submodules		* <code>git pull --recurse-submodules</code> — Updates local repository including all submodules
	* <code>git pull --rebase</code> — Updates local repository moving any local commits after any pulled commits. Good for keeping things in order when you push your commits.		* <code>git pull --rebase</code> — Updates local repository moving any local commits after any pulled commits. Good for keeping things in order when you push your commits.<br /><code>git pull --rebase --autostash</code> — Same as above, but automatically stashes your local changes before pulling.
	* <code>git add</code> — Add files to the list that will be committed.		* <code>git add</code> — Add files to the list that will be committed.
	* <code>git commit</code> — Commit your changes locally (after adding).		* <code>git commit</code> — Commit your changes locally (after adding).

Jona: Typo

2018-10-01T13:29:43Z

Typo

← Older revision		Revision as of 13:29, 1 October 2018
Line 5:		Line 5:
	* <code>git status</code> — Returns status of your local repository.		* <code>git status</code> — Returns status of your local repository.
	* <code>git pull</code> — Updates local repository from remote repository.		* <code>git pull</code> — Updates local repository from remote repository.
	* <code>git submodule update --init --recursive</code> — ~~Inicialice~~ submodules in your local repo (yes, inkscape has submodules since the 1.0 release)		* <code>git submodule update --init --recursive</code> — Initialize submodules in your local repo (yes, inkscape has submodules since the 1.0 release)
	* <code>git pull --recurse-submodules</code> — Updates local repository including all submodules		* <code>git pull --recurse-submodules</code> — Updates local repository including all submodules
	* <code>git pull --rebase</code> — Updates local repository moving any local commits after any pulled commits. Good for keeping things in order when you push your commits.		* <code>git pull --rebase</code> — Updates local repository moving any local commits after any pulled commits. Good for keeping things in order when you push your commits.

Jabiertxof: /* Git commands for the novice */

2018-10-01T07:41:55Z

Git commands for the novice

← Older revision		Revision as of 07:41, 1 October 2018
Line 5:		Line 5:
	* <code>git status</code> — Returns status of your local repository.		* <code>git status</code> — Returns status of your local repository.
	* <code>git pull</code> — Updates local repository from remote repository.		* <code>git pull</code> — Updates local repository from remote repository.
	* <code>git ~~pull~~ --~~recurse~~-~~submodules~~</code> — ~~Updates~~ local ~~repository including all submodules~~ (yes, inkscape has submodules since the 1.0 release)		* <code>git submodule update --init --recursive</code> — Inicialice submodules in your local repo (yes, inkscape has submodules since the 1.0 release)
			* <code>git pull --recurse-submodules</code> — Updates local repository including all submodules
	* <code>git pull --rebase</code> — Updates local repository moving any local commits after any pulled commits. Good for keeping things in order when you push your commits.		* <code>git pull --rebase</code> — Updates local repository moving any local commits after any pulled commits. Good for keeping things in order when you push your commits.
	* <code>git add</code> — Add files to the list that will be committed.		* <code>git add</code> — Add files to the list that will be committed.

Jnweiger: /* Cheat sheet for Bazaar users */

2018-09-10T11:36:06Z

Cheat sheet for Bazaar users

← Older revision		Revision as of 11:36, 10 September 2018
Line 19:		Line 19:

	== Cheat sheet for Bazaar users ==		== Cheat sheet for Bazaar users ==
			Historical reference. We no longer use bazaar.

	{\| class="wikitable"		{\| class="wikitable"

Jnweiger: /* Git commands for the novice */

2018-09-10T11:08:32Z

Git commands for the novice

← Older revision		Revision as of 11:08, 10 September 2018
Line 10:		Line 10:
	* <code>git commit</code> — Commit your changes locally (after adding).		* <code>git commit</code> — Commit your changes locally (after adding).
	* <code>git push</code> — Push your locally committed changes to remote repository.		* <code>git push</code> — Push your locally committed changes to remote repository.
	* <code>git remote -v</code> — Shows remote repository (should be: origin ~~https~~:/~~/git_to_be_determined~~).		* <code>git remote -v</code> — Shows remote repository (should be: origin git@gitlab.com:inkscape/inkscape.git).
	* <code>git checkout filename</code> — Reverts 'filename' to repository version.		* <code>git checkout filename</code> — Reverts 'filename' to repository version.
	* <code>git stash</code> — Move changes in directory out of the way (in order to 'pull' in changes).		* <code>git stash</code> — Move changes in directory out of the way (in order to 'pull' in changes).

Jnweiger: /* Git commands for the novice */

2018-09-10T11:06:33Z

Git commands for the novice

← Older revision		Revision as of 11:06, 10 September 2018
Line 5:		Line 5:
	* <code>git status</code> — Returns status of your local repository.		* <code>git status</code> — Returns status of your local repository.
	* <code>git pull</code> — Updates local repository from remote repository.		* <code>git pull</code> — Updates local repository from remote repository.
			* <code>git pull --recurse-submodules</code> — Updates local repository including all submodules (yes, inkscape has submodules since the 1.0 release)
	* <code>git pull --rebase</code> — Updates local repository moving any local commits after any pulled commits. Good for keeping things in order when you push your commits.		* <code>git pull --rebase</code> — Updates local repository moving any local commits after any pulled commits. Good for keeping things in order when you push your commits.
	* <code>git add</code> — Add files to the list that will be committed.		* <code>git add</code> — Add files to the list that will be committed.

Patrick87: /* Use ccache to speed up compilation after switching branches */

2018-03-21T22:26:05Z

Use ccache to speed up compilation after switching branches

← Older revision		Revision as of 22:26, 21 March 2018
Line 125:		Line 125:
	===Use ccache to speed up compilation after switching branches===		===Use ccache to speed up compilation after switching branches===

	As git [https://git.wiki.kernel.org/index.php/GitFaq#Why_isn.27t_Git_preserving_modification_time_on_files.3F does not preserve file modification times] you'd have to do a lot of recompiling whenever switching branches (unless you use the method [[#Checkout multiple branches into different folders\|described above]] for all your branches). This can be avoided by using [https://ccache.samba.org/ ccache]. There are many ways to use ccache (search the Internet!). A convenient way when using CMake are the [https://cmake.org/cmake/help/latest/variable/CMAKE_LANG_COMPILER_LAUNCHER.html#variable:CMAKE_%3CLANG%3E_COMPILER_LAUNCHER <code>CMAKE_<LANG>_COMPILER_LAUNCHER</code>] variables (needs CMake 3.4 or later). ~~Just add~~		As git [https://git.wiki.kernel.org/index.php/GitFaq#Why_isn.27t_Git_preserving_modification_time_on_files.3F does not preserve file modification times] you'd have to do a lot of recompiling whenever switching branches (unless you use the method [[#Checkout multiple branches into different folders\|described above]] for all your branches). This can be avoided by using [https://ccache.samba.org/ ccache]. There are many ways to use ccache (search the Internet!). A convenient way when using CMake are the [https://cmake.org/cmake/help/latest/variable/CMAKE_LANG_COMPILER_LAUNCHER.html#variable:CMAKE_%3CLANG%3E_COMPILER_LAUNCHER <code>CMAKE_<LANG>_COMPILER_LAUNCHER</code>] variables (needs CMake 3.4 or later).
	~~set(CMAKE_C_COMPILER_LAUNCHER "ccache")~~
	~~set(CMAKE_CXX_COMPILER_LAUNCHER "ccache")~~		Just run CMake with the additional arguments <code>-DCMAKE_C_COMPILER_LAUNCHER="ccache" -DCMAKE_CXX_COMPILER_LAUNCHER="ccache"</code> or use any other way you prefer to set the two variables accordingly.
	~~to the file ''"CMakeLists.txt"'' or~~ run CMake with the additional arguments <code>-DCMAKE_C_COMPILER_LAUNCHER="ccache" -DCMAKE_CXX_COMPILER_LAUNCHER="ccache"</code>

Patrick87: Undo revision 108536 by Jabiertxof (talk) that will cause a parser error - not sure what you meant here?

2018-03-07T20:59:51Z

Undo revision 108536 by Jabiertxof (talk) that will cause a parser error - not sure what you meant here?

← Older revision		Revision as of 20:59, 7 March 2018
Line 126:		Line 126:

	As git [https://git.wiki.kernel.org/index.php/GitFaq#Why_isn.27t_Git_preserving_modification_time_on_files.3F does not preserve file modification times] you'd have to do a lot of recompiling whenever switching branches (unless you use the method [[#Checkout multiple branches into different folders\|described above]] for all your branches). This can be avoided by using [https://ccache.samba.org/ ccache]. There are many ways to use ccache (search the Internet!). A convenient way when using CMake are the [https://cmake.org/cmake/help/latest/variable/CMAKE_LANG_COMPILER_LAUNCHER.html#variable:CMAKE_%3CLANG%3E_COMPILER_LAUNCHER <code>CMAKE_<LANG>_COMPILER_LAUNCHER</code>] variables (needs CMake 3.4 or later). Just add		As git [https://git.wiki.kernel.org/index.php/GitFaq#Why_isn.27t_Git_preserving_modification_time_on_files.3F does not preserve file modification times] you'd have to do a lot of recompiling whenever switching branches (unless you use the method [[#Checkout multiple branches into different folders\|described above]] for all your branches). This can be avoided by using [https://ccache.samba.org/ ccache]. There are many ways to use ccache (search the Internet!). A convenient way when using CMake are the [https://cmake.org/cmake/help/latest/variable/CMAKE_LANG_COMPILER_LAUNCHER.html#variable:CMAKE_%3CLANG%3E_COMPILER_LAUNCHER <code>CMAKE_<LANG>_COMPILER_LAUNCHER</code>] variables (needs CMake 3.4 or later). Just add
	CMAKE_C_COMPILER_LAUNCHER=ccache		set(CMAKE_C_COMPILER_LAUNCHER "ccache")
	CMAKE_CXX_COMPILER_LAUNCHER=ccache		set(CMAKE_CXX_COMPILER_LAUNCHER "ccache")
	to the file ''"CMakeLists.txt"'' or run CMake with the additional arguments <code>-DCMAKE_C_COMPILER_LAUNCHER="ccache" -DCMAKE_CXX_COMPILER_LAUNCHER="ccache"</code>		to the file ''"CMakeLists.txt"'' or run CMake with the additional arguments <code>-DCMAKE_C_COMPILER_LAUNCHER="ccache" -DCMAKE_CXX_COMPILER_LAUNCHER="ccache"</code>

Jabiertxof: /* Use ccache to speed up compilation after switching branches */

2018-03-07T20:30:35Z

Use ccache to speed up compilation after switching branches

← Older revision		Revision as of 20:30, 7 March 2018
Line 126:		Line 126:

	As git [https://git.wiki.kernel.org/index.php/GitFaq#Why_isn.27t_Git_preserving_modification_time_on_files.3F does not preserve file modification times] you'd have to do a lot of recompiling whenever switching branches (unless you use the method [[#Checkout multiple branches into different folders\|described above]] for all your branches). This can be avoided by using [https://ccache.samba.org/ ccache]. There are many ways to use ccache (search the Internet!). A convenient way when using CMake are the [https://cmake.org/cmake/help/latest/variable/CMAKE_LANG_COMPILER_LAUNCHER.html#variable:CMAKE_%3CLANG%3E_COMPILER_LAUNCHER <code>CMAKE_<LANG>_COMPILER_LAUNCHER</code>] variables (needs CMake 3.4 or later). Just add		As git [https://git.wiki.kernel.org/index.php/GitFaq#Why_isn.27t_Git_preserving_modification_time_on_files.3F does not preserve file modification times] you'd have to do a lot of recompiling whenever switching branches (unless you use the method [[#Checkout multiple branches into different folders\|described above]] for all your branches). This can be avoided by using [https://ccache.samba.org/ ccache]. There are many ways to use ccache (search the Internet!). A convenient way when using CMake are the [https://cmake.org/cmake/help/latest/variable/CMAKE_LANG_COMPILER_LAUNCHER.html#variable:CMAKE_%3CLANG%3E_COMPILER_LAUNCHER <code>CMAKE_<LANG>_COMPILER_LAUNCHER</code>] variables (needs CMake 3.4 or later). Just add
	~~set(~~CMAKE_C_COMPILER_LAUNCHER "ccache")		CMAKE_C_COMPILER_LAUNCHER=ccache
	~~set(~~CMAKE_CXX_COMPILER_LAUNCHER "ccache")		CMAKE_CXX_COMPILER_LAUNCHER=ccache
	to the file ''"CMakeLists.txt"'' or run CMake with the additional arguments <code>-DCMAKE_C_COMPILER_LAUNCHER="ccache" -DCMAKE_CXX_COMPILER_LAUNCHER="ccache"</code>		to the file ''"CMakeLists.txt"'' or run CMake with the additional arguments <code>-DCMAKE_C_COMPILER_LAUNCHER="ccache" -DCMAKE_CXX_COMPILER_LAUNCHER="ccache"</code>

Tavmjong: /* Checkout multiple branches into different folders */

2017-06-23T09:11:41Z

Checkout multiple branches into different folders

← Older revision		Revision as of 09:11, 23 June 2017
Line 121:		Line 121:
	As git branches are all stored in the same repository you'll only have one "working tree" (the set of files making up the branch) in the beginning and switching to another branch will modify all files on disk. To have multiple branches (say trunk and 0.92.x) checked out at the same time you can obviously clone the repository multiple times. However it's much more elegant to use the [https://git-scm.com/docs/git-worktree git-worktree] command which links a new working tree to your repository that can be on any branch you want. For example		As git branches are all stored in the same repository you'll only have one "working tree" (the set of files making up the branch) in the beginning and switching to another branch will modify all files on disk. To have multiple branches (say trunk and 0.92.x) checked out at the same time you can obviously clone the repository multiple times. However it's much more elegant to use the [https://git-scm.com/docs/git-worktree git-worktree] command which links a new working tree to your repository that can be on any branch you want. For example
	git worktree add 0.92.x_files 0.92.x		git worktree add 0.92.x_files 0.92.x
	will create a working tree for the ''0.92.x'' branch in the folder ''"0.92.x_files"''. You can then use this new working tree exactly like you'd use the main working tree.		will create a working tree for the ''0.92.x'' branch in the folder ''"0.92.x_files"''. You can then use this new working tree exactly like you'd use the main working tree. (You'll need to run <code>git checkout 0.92.x</code> to set the branch.)

	===Use ccache to speed up compilation after switching branches===		===Use ccache to speed up compilation after switching branches===