This link has been bookmarked by 180 people . It was first bookmarked on 19 May 2008, by Glenn M.
-
01 Mar 12
-
08 Feb 12
-
27 Jan 12
-
12 Jan 12
-
11 Jan 12
-
17 Nov 11
-
16 Nov 11
-
13 Nov 11
-
11 Nov 11
Andrea PolciThis will download all new changesets from Subversion, apply them to the last checkout from Subversion, and then re-apply your local changes on top of that.
-
07 Nov 11
-
30 Oct 11
-
26 Oct 11
-
-
git-svn clone -s http://example.com/my_subversion_repo local_dir
-
git-svn show-ignore > .gitignore
-
git checkout -b new_branch_name [old_branch_name]
-
git checkout master git merge <feature_branch>
-
Sometimes, you may make a lot of commits in your feature branch that you want represented as one commit in the main branch.
-
To do this, add the
--squashflag togit merge, like so:git merge --squash <feature_branch> -
git-svn rebase
-
git-svn dcommit
-
-
24 Oct 11
-
21 Oct 11
-
20 Oct 11
-
09 Oct 11
-
06 Oct 11
-
28 Sep 11
-
27 Sep 11
-
31 Aug 11
-
27 Aug 11
-
24 Aug 11
Albert LomarteUPDATING FROM AND COMMITTING BACK TO SUBVERSION
Before committing back to Subversion, you will want to update to apply any new changes in the repository to your local Git repo.
git-svn rebase
This will download all new changesets from Subversion, apply them to the last checkout from Subversion, and then re-apply your local changes on top of that.
When you’re ready to commit back to Subversion, execute:
git-svn dcommit -
19 Aug 11
-
23 Jul 11
An Be"Like many organizations using Rails, we have caught the git wave, and are in a state of transition between git and Subversion. Our open-source work is stored in git repositories, but our client work is still stored in Subversion repositories, and probably will be for some time. While git is amazing, Subversion still has its good qualities, and makes an excellent centralized repository, especially with its ecosystem of user-friendly tools.
The integration between git and Subversion (git-svn) is so well done that several of us have been using git as our interface to all our Subversion repositories. Doing this is fairly simple, but there are some interesting tricks, and so I thought I would share a day in the Viget life with git-svn. "git svn subversion git-svn howto reference integration versioncontrol scm
-
21 Jul 11
-
18 Jul 11
-
08 Jul 11
-
24 Jun 11
-
19 May 11
-
14 May 11
-
03 May 11
-
13 Apr 11
-
12 Apr 11
-
30 Mar 11
-
21 Mar 11
-
14 Mar 11
-
11 Mar 11
-
10 Mar 11
-
01 Mar 11
-
20 Feb 11
-
09 Feb 11
-
03 Feb 11
-
18 Jan 11
-
10 Jan 11
-
29 Dec 10
-
15 Dec 10
-
12 Dec 10
-
git reset --hard remotes/trunk
-
-
29 Nov 10
-
15 Nov 10
-
28 Oct 10
-
26 Oct 10
-
25 Oct 10
-
02 Oct 10
-
16 Aug 10
-
29 Jul 10
-
One of the best reasons to use git is its lightweight local branches. These are not the same as Subversion branches: they reside locally and can be created, destroyed, and merged easily. When working on a project, you’ll probably want to create a branch every time you work on a new feature. It’s very simple to do so: run the command
git branch new_branch_name master. “master” is the branch you are forking off a new branch from. If you want to fork from the current branch, you don’t have to say so. You can just as easily typegit branch new_branch_name. To move to this new branch, you rungit checkout new_branch_name. To make things easier, all of these steps can be combined, like so: -
Sometimes, you may make a lot of commits in your feature branch that you want represented as one commit in the main branch. This is especially useful if you’re using CruiseControl or some other automated testing tool: you can make one large commit that passes all the tests, and don’t necessarily have to worry about passing all the tests while developing your feature. To do this, add the
--squashflag togit merge, like so:
-
-
14 Jul 10
-
07 Jul 10
mptsk .The integration between git and Subversion (git-svn) is so well done that several of us have been using git as our interface to all our Subversion repositories. Doing this is fairly simple, but there are some interesting tricks, and so I thought I would s
git svn subversion git-svn tutorial howto scm versioncontrol
-
02 Jun 10
-
01 Jun 10
-
11 May 10
-
27 Apr 10
-
23 Apr 10
-
22 Apr 10
-
13 Apr 10
-
02 Apr 10
-
26 Mar 10
-
09 Mar 10
-
06 Mar 10
-
23 Feb 10
-
22 Feb 10
-
21 Feb 10
Gerardo LisboaLike many organizations using Rails, we have caught the git wave, and are in a state of transition between git and Subversion. Our open-source work is stored in git repositories, but our client work is still stored in Subversion repositories, and probably
programming ruby development subversion versioncontrol svn git
-
19 Feb 10
-
06 Feb 10
-
05 Feb 10
-
28 Jan 10
-
21 Jan 10
-
11 Jan 10
-
09 Jan 10
-
28 Dec 09
-
14 Dec 09
-
03 Dec 09
-
26 Nov 09
-
23 Nov 09
-
18 Nov 09
-
11 Nov 09
-
07 Oct 09
-
05 Oct 09
-
24 Sep 09
-
15 Sep 09
-
21 Aug 09
-
20 Aug 09
-
18 Aug 09
-
14 Aug 09
Would you like to comment?
Join Diigo for a free account, or sign in if you are already a member.