[[git]]
 
Trace:

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

git [2018/08/05 10:39]
 git [2024/02/25 09:52] (current)
rzr
Line 1: Line 1:
 +===== TODO =====
  
 +  * https://git-annex.branchable.com/walkthrough/
 +  * https://changelog.complete.org/archives/10516-using-git-annex-for-data-archiving
 +  * https://github.com/LocutusOfBorg/github-cheat-sheet# LearN
 +  * https://github.com/AmrDeveloper/GQL
 +
 +
 +
 +===== 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 :
 +
 +  * http://www.saintsjd.com/2012/01/a-better-ui-for-git/
 +
 +
 +===== WORKFLOW =====
 +
 +  * http://www.unixgarden.com/index.php/administration-systeme/git-pour-les-futurs-barbus
 +  * http://www.unixgarden.com/index.php/administration-systeme/git-les-mains-dans-le-cambouis
 +  * http://geewax.org/2009/11/21/agile-git-workflow.html
 +  * https://github.com/nvie/gitflow
 +  * http://osteele.com/archives/2008/05/commit-policies# ReaD
 +  * http://newartisans.com/2008/04/git-from-the-bottom-up/# ReaD
 +
 +
 +===== GIT =====
 +
 +  * [[maemo]]: http://talk.maemo.org/showthread.php?p=363943#post363943
 +  * http://www.unixgarden.com/index.php/administration-systeme/git-it
 +  * http://cheat.errtheblog.com/s/git/
 +  * http://en.wikipedia.org/wiki/Gerrit_%28software%29
 +
 +
 +===== DOCUMENTATION =====
 +
 +  * http://www.gitguys.com/topics/# Learn
 +  * http://sixrevisions.com/resources/git-tutorials-beginners/# TotoriaL
 +  * http://www.kernel.org/pub/software/scm/git/docs/user-manual.html
 +  * http://git.or.cz/#documentation
 +  * http://git.or.cz/gitwiki/GitFaq#head-b96f48bc9c925074be9f95c0fce69bcece5f6e73
 +  * http://progit.org/book/ch5-3.html#rebasing_and_cherry_picking_workflows
 +  * http://progit.org/2010/08/25/notes.html
 +  * http://www.wei-wang.com/ExplainGitWithD3/#
 +  * https://blog.isquaredsoftware.com/presentations/2019-03-git-internals-rewrite/# LearN
 +  * https://dev.to/molly_struve/there-is-no-right-way-git-rebase-vs-merge-2hc5# ReBase
 +  * https://ohmygit.org/# LearN
 +  * https://bakkenbaeck.github.io/a-random-walk-through-git/# InternaL
 +
 +
 +===== 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 =====
 +
 +  * http://git-annex.branchable.com/
 +
 +
 +  git-svn "RA layer file already exists:" 
 +  
 +  * http://stackoverflow.com/questions/2310080/how-to-remove-a-file-from-a-git-commit-to-push-to-svn
 +
 +  * http://linuxfr.org/news/nouveautes-autour-de-git
 +
 +  * http://git-annex.branchable.com/walkthrough/using_bup/
 +  * http://openmirage.org/blog/introducing-irmin
 +  * https://github.com/jesseduffield/lazygit# SoftWare ClI
 +  * https://fr.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow# LearN
 +
 +
 +===== SOFTWARE ======
 +
 +  * http://www.eclipse.org/egit/download/# [[Eclipse]] 
 +  * http://stackoverflow.com/questions/456403/can-git-be-integrated-with-xcode# [[macos]]
 +  * http://gitbox.pierlis.com/ http://www.kaleidoscopeapp.com/
 +  * https://github.com/sitaramc/gitolite# [[ScM]]
 +  * https://github.com/creationix/git-browser# OffLine
 +  * http://git-browser.creationix.com/
 +  * https://www.gitkraken.com/
 +  * https://www.gitignore.io/
 +  * https://github.com/extrawurst/gitui/# RusT
 +
 +
 +
 +
 +==== EMACS ===
 +
 +  * https://github.com/dimitri/el-get/issues/1120
 + * [[Emacs]] : magit http://alexott.net/en/writings/emacs-vcs/EmacsGit.html#
 +
 +==== SUBVERSION ====
 +
 +  * [[svn]] : http://progit.org/book/ch8-1.html
 +  * use : svn, stash, cherry-pick, bissec
 +
 +
 +==== TIPS ====
 +
 +git how to replace branch contents by other branch :
 +
 +  * http://stackoverflow.com/questions/6088440/git-how-to-use-rebase-with-theirs-strategy
 +  * http://stackoverflow.com/questions/4911794/git-command-for-making-one-branch-like-another
 +  * http://stackoverflow.com/questions/6088440/git-how-to-use-rebase-with-theirs-strategy
 +  * http://blogs.gnome.org/wjjt/2012/04/05/some-git-aliases/
 +  * http://adit.io/posts/2013-08-16-five-useful-git-tips.html
 +  * http://stackoverflow.com/questions/15472107/when-listing-git-ls-remote-why-theres-after-the-tag-name
 +
 +  * correct last commit : http://blog.jacius.info/articles/2008/6/22/git-tip-fix-a-mistake-in-a-previous-commit
 +
 +  * merge single file : http://stackoverflow.com/questions/307579/how-do-i-copy-a-version-of-a-single-file-from-one-git-branch-to-another/2392772#2392772
 +
 +  * ignore modes on windows : http://stackoverflow.com/questions/1580596/how-do-i-make-git-ignore-mode-changes-chmod 
 +  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"
 +
 +  * https://bugzilla.gnome.org/show_bug.cgi?id=723598
 +
 +
 +PatcH
 +
 +  git am
 +
 +  * http://www.winksaville.com/blog/linux/git-applying-patches/
 +
 +
 +ReWrite : emails in commits
 +
 +  * http://stackoverflow.com/questions/750172/how-do-i-change-the-author-of-a-commit-in-git
 +  * http://stackoverflow.com/questions/2919878/git-rewrite-previous-commit-usernames-and-emails
 +  * http://stackoverflow.com/questions/3042437/change-commit-author-at-one-specific-commit
 +
 +  
 +MisC:
 +
 +  * http://rubyglazed.com/post/15772234418/git-ify-your-command-line# StatuS
 +  * http://blog.wuwon.id.au/2010/09/painless-merge-conflict-resolution-in.html# MergE
 +  * http://interrobeng.com/2013/08/25/speed-up-git-5x-to-50x/# MirroR
 +  * https://help.github.com/articles/working-with-subtree-merge# GitModules
 +
 +==== TOOLS ====
 +
 + * http://www.planet-libre.org/?post_id=13858
 +
 +
 +==== 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 ====
 +
 +  * http://madduck.net/blog/2007.10.03:packaging-with-git/
 +  * http://wiki.debian.org/Alioth/Git
 +  * http://www.eyrie.org/~eagle/notes/debian/git.html
 +  * https://honk.sigxcpu.org/piki/projects/git-buildpackage/
 +  * https://bugs.launchpad.net/ubuntu/+source/git-buildpackage/+bug/403299
 +  * http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=552771
 +  * https://github.com/qw3rtman/gg# ShortCut
 +
 +===== CLOUD =====
 +
 +  * http://www.wikivs.com/wiki/GitHub_vs_Gitorious
 +  * http://talk.maemo.org/showthread.php?p=1209322#post1209322# GitOrious vs GitHub
 +  * https://about.gitlab.com/2015/03/03/gitlab-acquires-gitorious/
 +  * http://gitlabhq.com/# WebService
 +  * http://repo.or.cz/#
 +  * https://import.github.com
 +  * http://freepo.st/community/freesoftware/post/ctoug4dj/%20Code%20collaboration%20platform%20GitLab%20acquires%20rival%20Gitorious,%20will%20shut%20it%20down%20on%20June%201
 +  * https://notabug.org/repo/migrate
 +  * https://notabug.org/rzr
 +  * https://www.gnu.org/philosophy/who-does-that-server-really-serve.html# SaaS
 +  * http://talk.maemo.org/showthread.php?p=1463398#post1463398
 +  * http://linuxfr.org/news/gitlab-achete-gitorious
 +
 +@TaG: SaaS ClouD SoftWare ServeR HostinG WebService MigratE InfrA HostinG
 +
 +===== NOTES =====
 +
 +==== SVN ===
 +
 +svn cat ~ git show :
 +
 +http://stackoverflow.com/questions/2071288/equivalent-in-git-of-hg-cat-or-svn-cat
 +  git show $branch:$filename
 +
 +
 +==== 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 =====
 +
 +  * https://github.com/spulec/git-thanks/blob/master/bin/git-thanks
 +  * https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/log/?qt=grep&q=Thanks-to%3A
 +  * https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines#Patch_Header_Recommendations:_Upstream-Status
 +  * https://cbea.ms/git-commit/
 +  * https://www.conventionalcommits.org/en/v1.0.0/# ConventioN
 +
 +<code>
 ++Origin: <vendor|upstream|other>, <url of original patch>
 ++Bug: <url in upstream bugtracker>
 ++Bug-Debian: https://bugs.debian.org/<bugnumber>
 ++Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
 ++Forwarded: <no|not-needed|url proving that it has been forwarded>
 ++Reviewed-By: <name and email of someone who approved the patch>
 ++Last-Update: 2020-07-23
 ++Acked-by: ...
 ++See-Also: ...
 ++Upstream-Status: url?
 +
 ++ Apply-on:
 +</code>
 +
 +
 +===== SOFTWARE =====
 +
 +  * https://keybase.io/blog/encrypted-git-for-everyone
 +  * https://github.com/commitizen/cz-cli# TooL
 +
 +
 +===== github =====
 +
 +  * https://stackoverflow.com/questions/24987542/is-there-a-link-to-github-for-downloading-a-file-in-the-latest-release-of-a-repo
 +  * https://gist.github.com/shinypb/7d6014025cb7be2484d0# GitHub
 +  * http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=89ac9a6b8b1a21567cf8ef30e3fc8931eb808b39# GitHub
 +  * https://rawgit.org/#
 +
 +
 +===== LEARN =====
 +
 +  * https://gitexplorer.com/# LearN
 +  * https://fosdem.org/2024/schedule/event/fosdem-2024-3611-so-you-think-you-know-git/# LearN
 +  * http://luisbg.blogalia.com/historias/76017# TipS
 +  * https://gitorials.com/# TutoriaL
 +
 +
 +===== LINKS =====
 +
 +  * http://joeyh.name/blog/entry/git_push_over_XMPP/# GiT
 +  * http://www.eyrie.org/~eagle/notes/debian/git.html# DebiaN
 +  * https://github.com/MrMEEE/bumblebee-Old-and-abbandoned/commit/a047be85247755cdbe0acce6#diff-1
 +  * https://github.com/alx/gitbook/tree/french/text
 +  * http://www.mediawiki.org/wiki/Gerrit/Advanced_usage#missing_Change-Id_in_commit_message
 +  * https://fedoraproject.org/wiki/Package_maintenance_guide?rd=Using_Fedora_GIT # fedpkg
 +  * https://www.andyjeffries.co.uk/25-tips-for-intermediate-git-users/# GitShow
 +  * https://github.com/simonthum/git-sync/blob/master/git-sync
 +  * http://gitualize.com/# VisualizatioN
 +  * https://codingkilledthecat.wordpress.com/2012/04/28/why-your-company-shouldnt-use-git-submodules/#
 +  * http://softwareswirl.blogspot.fr/2013/05/git-imerge-practical-introduction.html#
 +  * https://blogs.msdn.microsoft.com/bharry/2017/05/24/the-largest-git-repo-on-the-planet/# FileSystem
 +  * https://git.codemadness.org/stagit/log.html
 +  * https://gitea.io/en-US/# 
 +  * https://gist.github.com/skratchdot/e44d7df7683a525f4b68# GitHub
 +  * https://juffalow.com/other/write-good-git-commit-message# ConventioN
 +  * https://stackoverflow.com/questions/55086815/git-is-there-any-tool-that-display-history-changes-when-fixing-up-commit-messag# 
 +  * https://docs.gitlab.com/ee/user/project/repository/repository_mirroring.html#
 +    * https://about.gitlab.com/pricing/self-managed/feature-comparison/
 +  * https://gogs.io/# ServicE WeB
 +  * https://yurichev.com/news/20201220_git/# InternaL
 +  * https://wiki.debian.org/Creating%20signed%20GitHub%20release
 +  * https://bugs.debian.org/871806# TaG
 +  * https://github.com/cyrusimap/cyrus-imapd/releases/
 +  * https://developers.redhat.com/articles/2023/08/02/beginners-guide-git-version-control#keeping_track_of_untracked_files#
 +  * https://github.blog/2024-02-23-highlights-from-git-2-44/
 +
 +
 +===== MORE =====
 +
 +@tag: ScM HosT [[vc]] [[xrandr]] [[scm]] [[svn]] [[cvs]] [[ssh]] [[linux]] [[hg]] [[work]] [[flow]] AdmiN
 +
 +{{http://ubuntuone.com/1lkEwn0Y5qowlpk6DVAYeZ#.gif}}
 +
 +{{http://img15.hostingpics.net/pics/629202759.jpg}}
 +
 +<html>
 +<iframe width="560" height="315" src="https://www.youtube.com/embed/udCXubFr5Yo" frameborder="0" allowfullscreen></iframe>
 +</html>
 
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