MEEGO / MAEMO / HARMATTAN

1st, Setup repo : http://rzr.online.fr/q/harmattan

apt-get remove git git-core # git 1.6.5.7-0maemo0~rzr2
apt-get install bash git-core # git-core_1.6.5.7-0maemo0~rzr4_armel.deb
PATH=${PATH}:/usr/libexec/git-core && export PATH
git --version # git version 1.6.5.7

I am currently packaging git for harmattan, fell free to improve it , branch this “user-rzr”

https://gitorious.org/~rzr/git/git

FeedBack: http://forum.meego.com/showthread.php?p=28936#post28936

@tag: handset harmattan

git clone root@nfc:/etc 
Cloning into 'etc'...
root@nfc's password: 
sh: git-upload-pack: Operation not permitted
fatal: The remote end hung up unexpectedly

ToDo :

WORKFLOW

GIT

DOCUMENTATION

GIT SVN

git-svn glmf129 ( romain pelisse )

 git rebase -i HEAD~6
 # git rebase pick reword edit squash

excludesfile

 git-rerere
 git stash list
 git cherry pick $h
 git rebase --ab
 git bessect start
 git b good $h
 git b bad HEAD
 git b run make test

TODO

SOFTWARE

EMACS

SUBVERSION

TIPS

git how to replace branch contents by other branch :

git config core.filemode false

export PS1='\u@\h:\W$(__git_ps1)'
git config --global core.autocrlf true

http://stackoverflow.com/questions/1889559/git-diff-to-ignore-m

http://stackoverflow.com/questions/1580596/how-do-i-make-git-ignore-mode-changes-chmod# git config core.filemode false

Delete remote branch name :

git push origin --delete <branchName>

(or git push origin :membership_processing )

TaG :

git show-ref --tags

http://stackoverflow.com/questions/5480258/how-to-delete-a-remote-git-tag/12791414#12791414

git push --delete "$origin" "$tag"

PatcH

git am

ReWrite : emails in commits

MisC:

TOOLS

USAGE

sudo aptitude install git-core 
git clone http://git.moblin.org/cgit.cgi/fastinit/ # http://www.moblin.org/repos/projects/mobile-browser.git
git status
git branch
git diff
# git commit -a -c "msg"
git log
# git push 

git update : using "master" branch

TODO

git update : using "incoming" branch

mkdir src &&  cd src 
git init
echo "src:init" >> README.txt
git add README.txt
git commit -a -m "init"
cd ..
git clone src cloned
cd cloned
git config remote.origin.push master:incoming
echo "cloned:clone" >> README.txt
cd ../src
echo "src:commit" >> README.txt
git commit -a -m "edited"
cd ../cloned
echo "cloned:commit" >> README.txt
git commit -a -m "edited"
git push  # incoming
cd ../src
echo "src:about to merge" >> README.txt
git commit -a -m "about to merge"
git merge incoming
mg README.txt
echo "src:resolved" >> README.txt
git add README.txt 
git commit -a -m "resolved" 
cd ../cloned/
git pull
cat README.txt

git push / reset : not suitable

will erase data :

mkdir src && cd src/
git init
echo 1 > README.txt
git add README.txt
git commit -a -m 1
cd ..
git clone src cloned
cd cloned/
echo 2 > README.txt
git diff
git commit -a -m 2
git pull && git push
cd ../src/
git log
git diff
cat README.txt # 1
git reset --hard HEAD
cat README.txt # 2

http://hans.fugal.net/blog/2008/11/10/git-push-is-worse-than-worthless#comment-1952

git

CLOUD

NOTES

SVN

ROSETA STONE

  • hg resolved : git commit
  • hg update : ~ git reset –hard HEAD
  • svn info ~ git remote show origin

MERGE

svn merge :
branch=master
git rebase -Xtheirs $branch # or merge..
git status | grep 'deleted by us:'  | cut -d: -f2 | xargs -eol git rm 
git status | grep 'added by them:'  | cut -d: -f2 | xargs -eol git add
git rebase --continue

git merge -Xtheirs $branch

ERRORS

error: server certificate verification failed. CAfile: /etc/ssl/certs/ca-certificates.crt CRLfile: none while accessing https://vcs.maemo.org/git/monky/info/refs
GIT_SSL_NO_VERIFY=1 git clone https://vcs.maemo.org/git/monky
warning: remote HEAD refers to nonexistent ref, unable to checkout.
* http://stackoverflow.com/questions/11893678/warning-remote-head-refers-to-nonexistent-ref-unable-to-checkout # TODO ?

Q:

git rebase
"You can repeat your command with --allow-empty,"

A:

git commit --amend --allow-empty

Commit

SOFTWARE

MORE

git.txt · Last modified: 2019/03/10 11:39 by rzr
 
Except where otherwise noted, content on this wiki is licensed under the following license: CC Attribution-Share Alike 3.0 Unported
Recent changes RSS feed Donate Powered by PHP Valid XHTML 1.0 Valid CSS Driven by DokuWiki