GIT: Difference between revisions
Jump to navigation
Jump to search
| Line 118: | Line 118: | ||
=== Fix defective commits === | === Fix defective commits === | ||
*** THIS CAN ONLY BE DONE BEFORE "git push" *** | |||
When I commit some changes and accidentally miss some file, I commit the missing file in the next commit, but now I have 2 commits instead of 1. Fix it by squashing the two commits into one: | |||
Run <code>git rebase -i HEAD~2</code>, an editor will open listing the 2 commits. For the second commit, replace "pick" with "fixup", save and exit. Git will merge the 2 commits discarding the commit message of the second (junk) commit. | |||
=== Create local branch, push it to bitbucket === | === Create local branch, push it to bitbucket === | ||
Revision as of 10:04, 12 August 2013
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 -la $ git status $ git commit -m"move into subdirectory" -a $ git checkout master $ ls -la $ git merge diskscrub_merge $ git log --graph $ git log --graph --oneline $ git push
Setup mirror of the ROOT git repository
ssh daqweb@ladd00 204 16:53 cd public_html/ 206 16:54 cd git/ 221 17:04 git clone --mirror http://root.cern.ch/git/root.git root.git 231 17:23 cd root.git/hooks/ 233 17:23 mv post-update.sample post-update 234 17:24 chmod a+x ./post-update
Additional commands:
- fetch latest version: cd root.git; git fetch; git update-server-info
- list all version tags: cd root.git; git tag -l
- list all version branches: cd root.git; git branch
Convert ROOTANA SVN to GIT
- extract the authors list: svn log -q file:///home/daqweb/svn/rootana | awk -F '|' '/^r/ {sub("^ ", "", $2); sub(" $", "", $2); print $2" = "$2" <"$2">"}' | sort -u > authors.txt
- adjust authors list: vi authors.txt
(no author) = (no author) <(no author)> daqweb = Konstantin Olchanski <daqweb> lindner = Thomas Lindner <lindner> olchansk = Konstantin Olchanski <olchansk>
- run conversion: git svn clone --stdlayout -A authors.txt file:///home/daqweb/svn/rootana
- doctor the SVN revision comments: cd rootana; git filter-branch -d /tmp/tmpfs/gitrewrite --msg-filter 'sed "/git-svn-id:/s;^.*/\([^/]*\)@\([0-9]*\).*$;SVN revision: \2;"' -- --all
- new git commit messages look like this:
commit 84461b29deccf4ce82893f9275f6e44a303943c4
Author: Thomas Lindner <lindner>
Date: Mon Jul 8 23:30:09 2013 +0000
Add a sleep to offline/paused display; otherwise program takes 100% of CPU...
SVN revision: 133
Push ROOTANA GIT to BITBUCKET
- create empty bitbucket public repository
- git remote add origin https://dd1@bitbucket.org/tmidas/test.git
- git push -u origin --all ### you will be prompted for your password
Clone, commit and push to BITBUCKET
1141 git clone https://bitbucket.org/tmidas/test.git 1143 cd test 1145 cd tests 1147 touch yyy 1148 git add yyy 1149 git commit 1151 git push https://dd1@bitbucket.org/tmidas/test.git
Add alternative git source to your local repository
git remote add triumf http://daq.triumf.ca/git/midas.git
Fix defective commits
- THIS CAN ONLY BE DONE BEFORE "git push" ***
When I commit some changes and accidentally miss some file, I commit the missing file in the next commit, but now I have 2 commits instead of 1. Fix it by squashing the two commits into one:
Run git rebase -i HEAD~2, an editor will open listing the 2 commits. For the second commit, replace "pick" with "fixup", save and exit. Git will merge the 2 commits discarding the commit message of the second (junk) commit.
Create local branch, push it to bitbucket
522 git branch feature/hsconfig 524 git checkout feature/hsconfig 525 git branch -a 528 xemacs src/mlogger.cxx 546 git commit src/mlogger.cxx 556 git push -u origin feature/hsconfig 557 git remote show origin 558 git status 559 git pull 560 git push
"git remote show origin" should show something like this:
konstantin-olchanskis-macbook:midas olchansk$ git remote show origin
* remote origin
Fetch URL: git@bitbucket.org:tmidas/midas
Push URL: git@bitbucket.org:tmidas/midas
HEAD branch: develop
Remote branches:
develop tracked
feature/CSS tracked
feature/MSCB_scan tracked
feature/MT_trans tracked
feature/hsconfig tracked
master tracked
Local branches configured for 'git pull':
develop merges with remote develop
feature/hsconfig merges with remote feature/hsconfig
Local refs configured for 'git push':
develop pushes to develop (up to date)
feature/hsconfig pushes to feature/hsconfig (up to date)
konstantin-olchanskis-macbook:midas olchansk$