Git - Revision history

Psmay at 14:24, 3 July 2018

2018-07-03T14:24:17Z

Psmay at 15:02, 15 February 2016

2016-02-15T15:02:42Z

Psmay at 15:41, 31 December 2014

2014-12-31T15:41:08Z

New page

'''git''' is a source code management and versioning tool that differentiates itself from CVS and svn (while aligning with [[bzr]]) in being distributed: Exclusive locks aren't really a thing and most activity occurs off the network.

==Undoing changes==

Git is complex enough that there are several semantically distinct ways to undo work.

[https://twitter.com/emmajanehw/status/549919920990208000/photo/1 This flowchart by gitforteams.com] gives a rundown of which one is appropriate for your situation.

==vs. [[bzr]]==

The single most confusing thing about git, if you're coming from bzr, is that your working copy typically encompasses multiple branches, rather than only one as normal in bzr. You list these with

git branch

and switch to one named ''foo'' with

git checkout ''foo''

If you have a place you want your code to end up (like <code>bzr push --remember</code>), you set up a remote:

git remote add ''remotename'' ''repo-URL''

Then you make it remember the "upstream branch", which is what remote and what branch to use when pushing:

git push -u ''remotename'' ''branch''

When committing everything that's changed, you basically do

git commit -c

If there are changed files you don't want to commit, you add them (which in bzr is something you only do with files that aren't watched yet) and don't add the files to be left behind.

git add ''files''
git commit # no -c

"git revert" doesn't do what "bzr revert" does. Do this instead:

git checkout . # Restore files as committed

← Older revision		Revision as of 14:24, 3 July 2018
Line 32:		Line 32:

	[https://twitter.com/emmajanehw/status/549919920990208000/photo/1 This flowchart by gitforteams.com] gives a rundown of which one is appropriate for your situation.		[https://twitter.com/emmajanehw/status/549919920990208000/photo/1 This flowchart by gitforteams.com] gives a rundown of which one is appropriate for your situation.
		+
		+	==Setting the difftool/mergetool program in the Windows version==
		+
		+	In Windows, I changed the local comparison tool to Meld like this:
		+
		+	git config diff.tool meld
		+	git config difftool.meld.path "C:\Program Files (x86)\Meld\meld\meld.exe"
		+	git config merge.tool meld
		+	git config mergetool.meld.path "C:\Program Files (x86)\Meld\meld\meld.exe"

	==vs. [[bzr]]==		==vs. [[bzr]]==

← Older revision		Revision as of 15:02, 15 February 2016
Line 1:		Line 1:
	'''git''' is a source code management and versioning tool that differentiates itself from CVS and svn (while aligning with [[bzr]]) in being distributed: Exclusive locks aren't really a thing and most activity occurs off the network.		'''git''' is a source code management and versioning tool that differentiates itself from CVS and svn (while aligning with [[bzr]]) in being distributed: Exclusive locks aren't really a thing and most activity occurs off the network.
		+
		+	==Starting a server repo==
		+
		+	Use the <code>--bare</code> option. This starts a repo without a working copy, which is what you want on a server.
		+
		+	===Create new, empty repo===
		+
		+	<syntaxhighlight lang=bash>
		+	cd ~/$parent_subdir
		+	mkdir $project_name
		+	cd $project_name
		+	git init --bare
		+	</syntaxhighlight>
		+
		+	===Clone existing repo===
		+
		+	<syntaxhighlight lang=bash>
		+	cd ~/$parent_subdir
		+	git clone --bare $existing_repo_url $project_name
		+	</syntaxhighlight>
		+
		+	===git URL===
		+
		+	If the above is done by <var>$username</var> on an SSH server <var>$hostname</var>, the resulting git URL is
		+
		+	$username@$hostname:$parent_subdir/$project_name

	==Undoing changes==		==Undoing changes==