Include:Git Basics - Revision history

Prabuanand: moved content from Creating patches page

2025-10-05T17:38:12Z

moved content from Creating patches page

← Older revision		Revision as of 17:38, 5 October 2025
Line 3:		Line 3:

	{{Cmd\|git stash}} if you want to "hide" your changes. Do this if you think there may be other commits against the same things you are working on and want to refresh your local checkout (using a <tt>git pull --rebase</tt>) from the master. Use <tt>git stash apply</tt> to get your stash back.		{{Cmd\|git stash}} if you want to "hide" your changes. Do this if you think there may be other commits against the same things you are working on and want to refresh your local checkout (using a <tt>git pull --rebase</tt>) from the master. Use <tt>git stash apply</tt> to get your stash back.

			=== Change to another branch ===

			To create and change to another branch:{{Cmd\|git checkout -b branchname}}

			So to change to another branch (e.g. the name of the package you want to edit) with:{{Cmd\|git checkout -b pkgname}}

			{{Tip\|If you have an old fork, update the fork first, see [[#Rebasing against upstream master\|rebasing]]}}

			To change from one branch to another existing branch:{{Cmd\|git checkout branchname}}

	=== Reset your local repository ===		=== Reset your local repository ===

Prabuanand: moved Cloning your forked repository to Git page

2025-02-18T09:38:21Z

moved Cloning your forked repository to Git page

← Older revision		Revision as of 09:38, 18 February 2025
Line 80:		Line 80:
	{{Cmd\|git add ./		{{Cmd\|git add ./
	git commit}}		git commit}}

	~~=== Cloning your forked repository ===~~

	Fork the repository you want to contribute to. For example to contribute a package or open a merge request for aports you would have to fork [https://gitlab.alpinelinux.org/alpine/aports alpine/aports]. Refer [https://docs.gitlab.com/ee/user/project/repository/forking_workflow.html#creating-a-fork Gitlab docs] if you're having problems with that.

	~~After forking you can clone the repository like so: {{Cmd\|git clone git@gitlab.alpinelinux.org:$USER/$REPO.git}}~~

	~~Replace $USER with the nickname of your Gitlab account and $REPO with the repository you want to work on.~~

	=== Rebasing against upstream master ===		=== Rebasing against upstream master ===

Prabuanand: added commands for cloning a forked repository and rebasing against upstream master

2025-02-18T09:34:13Z

added commands for cloning a forked repository and rebasing against upstream master

@@ Line 80: / Line 80: @@
 {{Cmd|git add ./
 git commit}}
 [[Category:Development]]
 [[Category:Git]]

Prabuanand: added git push heading

2025-02-18T03:43:32Z

added git push heading

← Older revision		Revision as of 03:43, 18 February 2025
Line 1:		Line 1:
			<!-- This page is transcluded in [[Git]]. Do not change heading levels. Add new git options keeping the heading levels consistent. -->
	=== Stashing ===		=== Stashing ===

Line 8:		Line 9:

	=== List the local branch ===		=== List the local branch ===

	You can now list your local branch by doing		You can now list your local branch by doing
	{{Cmd\|git branch}}		{{Cmd\|git branch}}
Line 14:		Line 16:

	=== List your local non committed changes ===		=== List your local non committed changes ===

	{{Cmd\|git status}}		{{Cmd\|git status}}

	=== Commit ===		=== Commit ===

	Now you can start to work on your tree. As soon as you feel you have reached a step in development where you can commit your work '''locally''', use		Now you can start to work on your tree. As soon as you feel you have reached a step in development where you can commit your work '''locally''', use
	{{Cmd\|git commit -a}}		{{Cmd\|git commit -a}}
Line 39:		Line 43:

	fixes #<issuenumber>		fixes #<issuenumber>


	Think of first line as the subject in an email and the third line and on as the body of the email, describing what the commit does. You don't need the long description but the first line, the short description should be there as it will be showed in the commit log.		Think of first line as the subject in an email and the third line and on as the body of the email, describing what the commit does. You don't need the long description but the first line, the short description should be there as it will be showed in the commit log.
Line 46:		Line 49:

	=== List your commits ===		=== List your commits ===

	To view the list your commits: {{Cmd\|git log}}		To view the list your commits: {{Cmd\|git log}}
	To Check what you are going to push from local to remote: {{Cmd\|git log origin..master}}		To Check what you are going to push from local to remote: {{Cmd\|git log origin..master}}

	=== Keeping your local working branch in sync ===		=== Keeping your local working branch in sync ===

	Pull the changes from upstream (git.alpinelinux.org)		Pull the changes from upstream (git.alpinelinux.org)
	{{Cmd\|git pull --rebase}}		{{Cmd\|git pull --rebase}}
Line 56:		Line 61:

	=== Git Tag ===		=== Git Tag ===

	Create an annotated tag and push it.		Create an annotated tag and push it.

	{{Cmd\|git tag -a ''tagname'' -m 'commit message (e.g release 1.x)'		{{Cmd\|git tag -a ''tagname'' -m 'commit message (e.g release 1.x)'
	git push && git push --tags}}		git push && git push --tags}}

			=== Git push ===

			To push your changes up to the master. {{Cmd\|git push}}

	=== Create a new project ===		=== Create a new project ===

	Create your own directory that you want to become your new acf-mystuff project.		Create your own directory that you want to become your new acf-mystuff project.
	{{Cmd\|mkdir acf-mystuff		{{Cmd\|mkdir acf-mystuff

Prabuanand: updated the section with additional command

2025-02-18T03:35:14Z

updated the section with additional command

← Older revision		Revision as of 03:35, 18 February 2025
Line 46:		Line 46:

	=== List your commits ===		=== List your commits ===
	{{Cmd\|git log}}		To view the list your commits: {{Cmd\|git log}}
			To Check what you are going to push from local to remote: {{Cmd\|git log origin..master}}

	=== Keeping your local working branch in sync ===		=== Keeping your local working branch in sync ===

Prabuanand: Removed the h2 heading so that this include fits properly inside main git page

2024-08-14T09:50:55Z

Removed the h2 heading so that this include fits properly inside main git page

← Older revision		Revision as of 09:50, 14 August 2024
Line 1:		Line 1:
	~~== Git Basics ==~~
	=== Stashing ===		=== Stashing ===

Prabuanand: Added h2 Git Basics and moved previous h2 to h3

2024-08-14T09:26:42Z

Added h2 Git Basics and moved previous h2 to h3

← Older revision		Revision as of 09:26, 14 August 2024
Line 1:		Line 1:
	== Stashing ==		== Git Basics ==
			=== Stashing ===

	{{Cmd\|git stash}} if you want to "hide" your changes. Do this if you think there may be other commits against the same things you are working on and want to refresh your local checkout (using a <tt>git pull --rebase</tt>) from the master. Use <tt>git stash apply</tt> to get your stash back.		{{Cmd\|git stash}} if you want to "hide" your changes. Do this if you think there may be other commits against the same things you are working on and want to refresh your local checkout (using a <tt>git pull --rebase</tt>) from the master. Use <tt>git stash apply</tt> to get your stash back.

	== Reset your local repository ==		=== Reset your local repository ===

	{{Cmd\|git checkout -f master}} if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository. You will lose local changes.		{{Cmd\|git checkout -f master}} if you think your tree is pretty hopeless, need a kill-and-fill to bring the master into your local repository. You will lose local changes.

	== List the local branch ==		=== List the local branch ===
	You can now list your local branch by doing		You can now list your local branch by doing
	{{Cmd\|git branch}}		{{Cmd\|git branch}}
Line 13:		Line 14:
	* master		* master

	== List your local non committed changes ==		=== List your local non committed changes ===
	{{Cmd\|git status}}		{{Cmd\|git status}}

	== Commit ==		=== Commit ===
	Now you can start to work on your tree. As soon as you feel you have reached a step in development where you can commit your work '''locally''', use		Now you can start to work on your tree. As soon as you feel you have reached a step in development where you can commit your work '''locally''', use
	{{Cmd\|git commit -a}}		{{Cmd\|git commit -a}}
Line 45:		Line 46:
	{{tip\|You can add the following line to your {{path\|~/.vimrc}}:<pre>autocmd FileType gitcommit set textwidth=72</pre> }}		{{tip\|You can add the following line to your {{path\|~/.vimrc}}:<pre>autocmd FileType gitcommit set textwidth=72</pre> }}

	== List your commits ==		=== List your commits ===
	{{Cmd\|git log}}		{{Cmd\|git log}}


	== Keeping your local working branch in sync ==		=== Keeping your local working branch in sync ===
	Pull the changes from upstream (git.alpinelinux.org)		Pull the changes from upstream (git.alpinelinux.org)
	{{Cmd\|git pull --rebase}}		{{Cmd\|git pull --rebase}}
Line 55:		Line 56:
	Run the command: {{Cmd\|git config branch.origin.rebase true}} Next time you do 'git pull' you are actually doing a 'git pull --rebase'.}}		Run the command: {{Cmd\|git config branch.origin.rebase true}} Next time you do 'git pull' you are actually doing a 'git pull --rebase'.}}

	== Git Tag ==		=== Git Tag ===
	Create an annotated tag and push it.		Create an annotated tag and push it.

Line 61:		Line 62:
	git push && git push --tags}}		git push && git push --tags}}

	== Create a new project ==		=== Create a new project ===
	Create your own directory that you want to become your new acf-mystuff project.		Create your own directory that you want to become your new acf-mystuff project.
	{{Cmd\|mkdir acf-mystuff		{{Cmd\|mkdir acf-mystuff

Prabuanand: Moved. So removed the Move message

2024-08-14T09:16:27Z

Moved. So removed the Move message

← Older revision		Revision as of 09:16, 14 August 2024
Line 1:		Line 1:
	~~{{Move\|Git\|All git development articles should be consolidated}}~~

	== Stashing ==		== Stashing ==

Prabuanand: Prabuanand moved page Development using git:Basic usage to Include:Git Basics: This proposal for moving and integrating all the Git pages are pending for quite some.

2024-08-14T09:15:51Z

Prabuanand moved page Development using git:Basic usage to Include:Git Basics: This proposal for moving and integrating all the Git pages are pending for quite some.

← Older revision	Revision as of 09:15, 14 August 2024
(No difference)

Astrawso at 19:23, 9 December 2018

2018-12-09T19:23:29Z

← Older revision		Revision as of 19:23, 9 December 2018
Line 1:		Line 1:
			{{Move\|Git\|All git development articles should be consolidated}}

	== Stashing ==		== Stashing ==