Mobile - Settings - Register - Help

Home

Quick jump: What's new - Weblogs

Print
Tools

V

6

Tags

{"maxCount":21,"tags":[{"page_count":21,"count":null,"name":"hardware"},{"page_count":18,"count":null,"name":"Welcome"},{"page_count":17,"count":null,"name":"howto"},{"page_count":12,"count":null,"name":"FPGA"},{"page_count":9,"count":null,"name":"arm"},{"page_count":8,"count":null,"name":"OpenVZ"},{"page_count":7,"count":null,"name":"projects"},{"page_count":7,"count":null,"name":"virtualization"},{"page_count":7,"count":null,"name":"linux"},{"page_count":6,"count":null,"name":"air quality"},{"page_count":5,"count":null,"name":"SocialText"},{"page_count":5,"count":null,"name":"Android"},{"page_count":5,"count":null,"name":"STM32"},{"page_count":4,"count":null,"name":"Arduino"},{"page_count":4,"count":null,"name":"RFID"},{"page_count":3,"count":null,"name":"RaspberryPi"},{"page_count":3,"count":null,"name":"home-assistant"},{"page_count":3,"count":null,"name":"ADSL"},{"page_count":3,"count":null,"name":"Jifty"},{"page_count":3,"count":null,"name":"openmoko"},{"page_count":3,"count":null,"name":"KVM"},{"page_count":2,"count":null,"name":"razmjenavjestina"},{"page_count":2,"count":null,"name":"NoSQL"},{"page_count":2,"count":null,"name":"gsm"},{"page_count":2,"count":null,"name":"WebGUI"},{"page_count":2,"count":null,"name":"security"},{"page_count":2,"count":null,"name":"QEMU"},{"page_count":2,"count":null,"name":"usb"},{"page_count":2,"count":null,"name":"svn"},{"page_count":2,"count":null,"name":"433 MHz"},{"page_count":2,"count":null,"name":"eeepc"},{"page_count":2,"count":null,"name":"STM8"},{"page_count":2,"count":null,"name":"VoIP"},{"page_count":2,"count":null,"name":"perl"},{"page_count":2,"count":null,"name":"PowerPC"},{"page_count":2,"count":null,"name":"usb-tester"},{"page_count":2,"count":null,"name":"RF"},{"page_count":2,"count":null,"name":"php"},{"page_count":2,"count":null,"name":"motion sensor"},{"page_count":2,"count":null,"name":"esp8285"},{"page_count":2,"count":null,"name":"DVB"},{"page_count":2,"count":null,"name":"TV"},{"page_count":2,"count":null,"name":"PostgreSQL"},{"page_count":2,"count":null,"name":"PIC"},{"page_count":2,"count":null,"name":"asterisk"},{"page_count":1,"count":null,"name":"nslu2"},{"page_count":1,"count":null,"name":"javascript"},{"page_count":1,"count":null,"name":"PIC16F684"},{"page_count":1,"count":null,"name":"Email"},{"page_count":1,"count":null,"name":"8051"},{"page_count":1,"count":null,"name":"A10"},{"page_count":1,"count":null,"name":"csv"},{"page_count":1,"count":null,"name":"ppc"},{"page_count":1,"count":null,"name":"video"},{"page_count":1,"count":null,"name":"Kindle"},{"page_count":1,"count":null,"name":"Ubuntu"},{"page_count":1,"count":null,"name":"wiki"},{"page_count":1,"count":null,"name":"bluetooth"},{"page_count":1,"count":null,"name":"css"},{"page_count":1,"count":null,"name":"sdr"},{"page_count":1,"count":null,"name":"printer"},{"page_count":1,"count":null,"name":"https"},{"page_count":1,"count":null,"name":"Bioinformatics"},{"page_count":1,"count":null,"name":"Dell"},{"page_count":1,"count":null,"name":"subversion"},{"page_count":1,"count":null,"name":"MSP430"},{"page_count":1,"count":null,"name":"icecast"},{"page_count":1,"count":null,"name":"Cisco"},{"page_count":1,"count":null,"name":"PPPoE"},{"page_count":1,"count":null,"name":"vpn"},{"page_count":1,"count":null,"name":"eeprom"},{"page_count":1,"count":null,"name":"GXemul"},{"page_count":1,"count":null,"name":"Seaside"},{"page_count":1,"count":null,"name":"http"},{"page_count":1,"count":null,"name":"kde"},{"page_count":1,"count":null,"name":"CARNet"},{"page_count":1,"count":null,"name":"hid"},{"page_count":1,"count":null,"name":"darkice"},{"page_count":1,"count":null,"name":"gearman"},{"page_count":1,"count":null,"name":"Baze podataka"},{"page_count":1,"count":null,"name":"iBook"},{"page_count":1,"count":null,"name":"mash"},{"page_count":1,"count":null,"name":"IR"},{"page_count":1,"count":null,"name":"olsr"},{"page_count":1,"count":null,"name":"wifi"},{"page_count":1,"count":null,"name":"ogg"},{"page_count":1,"count":null,"name":"esp8266"},{"page_count":1,"count":null,"name":"fbtft"},{"page_count":1,"count":null,"name":"FreeBSD"},{"page_count":1,"count":null,"name":"Smalltalk"},{"page_count":1,"count":null,"name":"A20"},{"page_count":1,"count":null,"name":"sysadmin"},{"page_count":1,"count":null,"name":"streaming"},{"page_count":1,"count":null,"name":"bcm968xx"},{"page_count":1,"count":null,"name":"git"},{"page_count":1,"count":null,"name":"svn2cvs"},{"page_count":1,"count":null,"name":"rk3066"},{"page_count":1,"count":null,"name":"shell"},{"page_count":1,"count":null,"name":"debian"},{"page_count":1,"count":null,"name":"ups"},{"page_count":1,"count":null,"name":"ssl"},{"page_count":1,"count":null,"name":"Apple"},{"page_count":1,"count":null,"name":"3M"},{"page_count":1,"count":null,"name":"mysql"},{"page_count":1,"count":null,"name":"Announcements"},{"page_count":0,"count":null,"name":"bljak"},{"page_count":0,"count":null,"name":"HTC"}]}

Incoming Links

There are no pages that link to this page yet.

Attachments

Dobrica Pavlinušić's random unstructured stuff

Git

gitweb-ssl+htdigest.diff

This is my notebook with useful (to me) git hints

Contents

Resolve merge conflict

List files which have conflicts
Checkout all three versions
Mark conflict resolved

Migrate google code project to github
svn git error: Unable to extract revision information from commit
github setup
recover delted files

Resolve merge conflict

List files which have conflicts

$ git ls-files --unmerged
100644 435b838c30242833e667538c19119e972c30d1cc 1       target-ppc/cpu.h
100644 f5db1cec931da9781f65a0a6b2678370862f6d51 2       target-ppc/cpu.h
100644 f1df741e1e50bea39ae21118f1faab56a06d8a74 3       target-ppc/cpu.h
100644 60e3a36f1c55912a468694ca2c2712abf31f3d57 1       target-ppc/translate_init.c
100644 910fdd1d186f57c29c9d2044401290073ad78fe7 2       target-ppc/translate_init.c
100644 cc8333f92836441fe20c14c7a26bb959a05a3968 3       target-ppc/translate_init.c

Checkout all three versions

$ git cat-file blob :1:target-ppc/cpu.h > target-ppc/cpu.h.1
$ git cat-file blob :2:target-ppc/cpu.h > target-ppc/cpu.h.2
$ git cat-file blob :3:target-ppc/cpu.h > target-ppc/cpu.h.3

Make a diff, and create one copy which will be final with all changes merged

Mark conflict resolved

$ git update-index target-ppc/cpu.h

Migrate google code project to github

dpavlin@t61p:/rest/cvs$ git svn clone -s -A ~/.gitauthors https://perl-cwmp.googlecode.com/svn/ perl-cwmp

svn git error: Unable to extract revision information from commit

# start with the svn head
git checkout -b tempbranch trunk
# bring in all the changes from your branch
git merge --squash myhead
# commit with whatever message you want
git commit
# and ship it up to svn land
git svn dcommit

github setup

$ git config --global user.name "Dobrica Pavlinusic"
$ git config --global user.email "dpavlin@rot13.org"

recover delted files

$ git add something
$ git reset --hard # WOOPS!

$ git fsck --lost-found

Upload Files

Click "Browse" to find the file you want to upload. When you click "Upload file" your file will be uploaded and added to the list of attachments for this page.

Maximum file size: 50MB

Add a link to the attachment at the top of the page? Images will appear in the page.

Expand zip archive and attach individual files to the page

Done

	File Name	Author	Date Uploaded	Size

Close

Delete Selected Files

Upload Files

Click "Browse" to find the file you want to upload. When you click "Add file" this file will be added to the list of attachments for this page, and uploaded when you save the page.

Add a link to the attachment at the top of the page? Images will appear in the page when the page is saved.

Expand zip archive and attach individual files to the page

Done

Add file

Add Tags

Enter a tag and click "Add tag". The tag will be saved when you save the page.

Tag:

Suggestions:

Done

Add tag

{file: gitweb-ssl+htdigest.diff}

This is my notebook with useful (to me) git hints

{toc: }

^ Resolve merge conflict

^^ List files which have conflicts

.pre
$ git ls-files --unmerged
100644 435b838c30242833e667538c19119e972c30d1cc 1       target-ppc/cpu.h
100644 f5db1cec931da9781f65a0a6b2678370862f6d51 2       target-ppc/cpu.h
100644 f1df741e1e50bea39ae21118f1faab56a06d8a74 3       target-ppc/cpu.h
100644 60e3a36f1c55912a468694ca2c2712abf31f3d57 1       target-ppc/translate_init.c
100644 910fdd1d186f57c29c9d2044401290073ad78fe7 2       target-ppc/translate_init.c
100644 cc8333f92836441fe20c14c7a26bb959a05a3968 3       target-ppc/translate_init.c
.pre

^^ Checkout all three versions

.pre
$ git cat-file blob :1:target-ppc/cpu.h > target-ppc/cpu.h.1
$ git cat-file blob :2:target-ppc/cpu.h > target-ppc/cpu.h.2
$ git cat-file blob :3:target-ppc/cpu.h > target-ppc/cpu.h.3
.pre

Make a diff, and create one copy which will be final with all changes merged

^^ Mark conflict resolved

.pre
$ git update-index target-ppc/cpu.h
.pre

^ Migrate google code project to github

.pre
dpavlin@t61p:/rest/cvs$ git svn clone -s -A ~/.gitauthors https://perl-cwmp.googlecode.com/svn/ perl-cwmp
.pre

^ svn git error: Unable to extract revision information from commit

.pre
# start with the svn head
git checkout -b tempbranch trunk
# bring in all the changes from your branch
git merge --squash myhead
# commit with whatever message you want
git commit
# and ship it up to svn land
git svn dcommit

.pre

^ github setup

.pre
$ git config --global user.name "Dobrica Pavlinusic"
$ git config --global user.email "dpavlin@rot13.org"
.pre

^ recover delted files

.pre
$ git add something
$ git reset --hard # WOOPS!

$ git fsck --lost-found
.pre