Git usage - Revision history

Aurelien.falco: /* Access */

2024-12-13T16:49:29Z

‎Access

2024-12-13T16:45:20Z

‎Access

2024-12-13T16:41:15Z

‎Access

2024-12-13T16:39:51Z

2024-12-13T16:38:54Z

2024-12-10T11:03:17Z

‎Setup and link with svn (highly recommended if not required)

2024-09-25T16:03:01Z

git stash

2024-09-18T13:32:24Z

‎Setup

2024-09-18T13:28:17Z

‎Setup

2024-09-18T13:26:03Z

added faq category

@@ Line 20: / Line 20: @@
 </syntaxhighlight>
-Note that running the '''git_init.sh''' script is <u>required</u> if you want to [[#Simple commands|push]] your work to the project.
+Note that running the '''[[Git-svn|git_init.sh]]''' script is <u>required</u> if you want to [[#Simple commands|push]] your work to the project.
 It will [[git-svn|setup the repository and link git with svn]] ([[git-svn]] is a pre-requisite).
-The git_init.sh script will allow you to:
+The [[Git-svn|git_init.sh script]] will allow you to:
-* commit and get changes from the svn repository each time you use the '''git push''' command.
+* synchronize the local git master branch with the svn repository, each time you use the '''git push''' command.
-* push to the git remote master branch the '''2nd time''' you use '''git push''' (too much information just in case: the first push changes the hashes of each new local git commit to add the revision number of the svn commit, which therefore requires a 2nd push).
+* push local commits to the git remote master branch the '''2nd time''' you use '''git push''' ([[Git-svn#pre-push hook|too much information just in case: the first push changes the hashes of each new local git commit to add the revision number of the svn commit, which therefore requires a 2nd push]]).
 == Simple commands ==

@@ Line 22: / Line 22: @@
 Note that running the '''git_init.sh''' script is <u>required</u> if you want to [[#Simple commands|push]] your work to the project.
 It will [[git-svn|setup the repository and link git with svn]] ([[git-svn]] is a pre-requisite).
-This will allow you to commit and get changes from the svn repository each time you use the '''git push''' command. A second '''git push''' is required to effectively push the new commits (hashes may have changed) on the remote git repository.
 == Simple commands ==

@@ Line 20: / Line 20: @@
 </syntaxhighlight>
-Note that running the '''git_init.sh''' script is <u>required</u> if you want to push your work to the project.
+Note that running the '''git_init.sh''' script is <u>required</u> if you want to [[#Simple commands|push]] your work to the project.
 It will [[git-svn|setup the repository and link git with svn]] ([[git-svn]] is a pre-requisite).
 This will allow you to commit and get changes from the svn repository each time you use the '''git push''' command. A second '''git push''' is required to effectively push the new commits (hashes may have changed) on the remote git repository.

@@ Line 20: / Line 20: @@
 </syntaxhighlight>
-Note that running the '''git_init.sh''' script is <u>required</u>.
+Note that running the '''git_init.sh''' script is <u>required</u> if you want to push your work to the project.
 It will [[git-svn|setup the repository and link git with svn]] ([[git-svn]] is a pre-requisite).
 This will allow you to commit and get changes from the svn repository each time you use the '''git push''' command. A second '''git push''' is required to effectively push the new commits (hashes may have changed) on the remote git repository.

@@ Line 9: / Line 9: @@
 <syntaxhighlight lang="bash">
 git clone git@gitlab.in2p3.fr:la-communaut-des-mod-les-atmosph-riques-plan-taires/git-trunk.git
 </syntaxhighlight>
@@ Line 14: / Line 16: @@
 <syntaxhighlight lang="bash">
 git clone https://gitlab.in2p3.fr/la-communaut-des-mod-les-atmosph-riques-plan-taires/git-trunk.git
-</syntaxhighlight>
+cd git-trunk
 ./UTIL/git_init.sh
 </syntaxhighlight>
-This will [[git-svn|connect the git with the svn]] ([[git-svn]] is a pre-requisite). This will allow you to commit and get changes from the svn repository each time you use the '''git push''' command. A second '''git push''' is required to effectively push the new commits (hashes may have changed) on the remote git repository.
+Note that running the '''git_init.sh''' script is <u>required</u>.
 == Simple commands ==

@@ Line 16: / Line 16: @@
 </syntaxhighlight>
-== Setup and link with svn (highly recommended if not required) ==
+== [[git-svn|Setup and link with svn]] (highly recommended if not required) ==
 Simply follow the README.md at the root folder of the repository, i.e., run the following script to setup the git:

@@ Line 77: / Line 77: @@
 git push --force
 </syntaxhighlight>
 == Merge-request ==

← Older revision		Revision as of 13:26, 18 September 2024
Line 123:		Line 123:
	== Issues ==		== Issues ==
	You can track issues on the [https://gitlab.in2p3.fr/la-communaut-des-mod-les-atmosph-riques-plan-taires/git-trunk/-/issues ''issues''] page.		You can track issues on the [https://gitlab.in2p3.fr/la-communaut-des-mod-les-atmosph-riques-plan-taires/git-trunk/-/issues ''issues''] page.
		+
		+	[[Category:FAQ]]