Difference between revisions of "GIT"

From DaqWiki
Jump to navigation Jump to search
m
Line 37: Line 37:
 
=== Merge history from another git repository ===
 
=== Merge history from another git repository ===
  
aaa
+
<pre>
 +
$ git fetch file:///home/olchansk/sysadm/rpm/diskscrub/ master:diskscrub_merge
 +
$ git checkout master:diskscrub_merge
 +
$ mkdir diskscrub
 +
$ git add diskscrub
 +
$ git mv *.* diskscrub
 +
$ ls -l
 +
$ git status
 +
$ git commit -m"move into subdirectory" -a
 +
$ git checkout master
 +
$ ls -l
 +
$ git merge diskscrub_merge
 +
$ git log --graph
 +
$ git push
 +
</pre>

Revision as of 12:33, 6 February 2013

GIT NOTES

Create personal "cloneable" repository

This uses the "dual" repository method: the first repository is a bare repository is exported to the world via httpd, the second repository is where all work is done, committed. When ready, the work repository is pushed to the bare repository and becomes visible to the world.

$ cd ~/public_html/git
$ git init --bare rpms.git
Initialized empty Git repository in /home/olchansk/public_html/git/rpms.git/
$ cd rpms/hooks
$ mv post-update.sample post-update
$ chmod a+x ./post-update 
$ cd ~/git/
$ git clone ~/public_html/git/rpms.git rpms
warning: You appear to have cloned an empty repository.
$ cd rpms
$ date > test
$ git add test
$ git commit -m"test"
[master (root-commit) 9236a84] test
$ git push origin master
To /home/olchansk/public_html/git/rpms.git
 * [new branch]      master -> master
$ rm test
$ date > test 
$ git add test
$ git commit -m"test"
[master 54a6b4e] test
$ git push
To /home/olchansk/public_html/git/rpms.git
   9236a84..54a6b4e  master -> master
$ ssh to somewhere else
$ git clone http://ladd00.triumf.ca/~olchansk/git/rpms.git rpms

Merge history from another git repository

$ git fetch file:///home/olchansk/sysadm/rpm/diskscrub/ master:diskscrub_merge
$ git checkout master:diskscrub_merge
$ mkdir diskscrub
$ git add diskscrub
$ git mv *.* diskscrub
$ ls -l
$ git status
$ git commit -m"move into subdirectory" -a
$ git checkout master
$ ls -l
$ git merge diskscrub_merge
$ git log --graph
$ git push