| commit | 72190b3c715b223a2c356b5c477123a64a9e6e54 | |
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | |
| Tue, 8 Apr 2008 05:51:19 +0000 (8 07:51 +0200) | ||
| committer | Robin Rosenberg <robin.rosenberg@dewire.com> | |
| Tue, 8 Apr 2008 05:51:19 +0000 (8 07:51 +0200) | ||
| tree | f54fbccb91ff3a25f9a68dc4abfdeff8bff63fa9 | treesnapshot (tar.gz zip) |
| parent | 682216bbaa1d66c5a9d18cac58d1fdf8d08f8f78 | commitdiff |
| parent | 8b9ac8d4a8c2dc98fa46b534f84ec0293ee221c1 | commitdiff |
Merge branch 'master' into rr/fetchmergewithshawn
* master:
Fixed wrong name for remotes refs
Cloning Wizard: Store remote configuration after clone
Cloning wizard: Update index, HEAD and refs/heads/master on clone
Cloning wizard: Allow user to name origin
Add method to update repository config file
Create some commonly used constants for use with refs and remotes
Refactor getWorkDir() to Repository
Conflicts:
org.spearce.jgit/src/org/spearce/jgit/lib/Constants.java
org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java
org.spearce.jgit/src/org/spearce/jgit/lib/RepositoryConfig.java
* master:
Fixed wrong name for remotes refs
Cloning Wizard: Store remote configuration after clone
Cloning wizard: Update index, HEAD and refs/heads/master on clone
Cloning wizard: Allow user to name origin
Add method to update repository config file
Create some commonly used constants for use with refs and remotes
Refactor getWorkDir() to Repository
Conflicts:
org.spearce.jgit/src/org/spearce/jgit/lib/Constants.java
org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java
org.spearce.jgit/src/org/spearce/jgit/lib/RepositoryConfig.java