• http://progit.org/2010/08/25/notes.html
• A successful Git branching model » nvie.com
  • gitflow
• http://book.git-scm.com/3_distributed_workflows.html

• http://stackoverflow.com/questions/750172/how-do-i-change-the-author-of-a-commit-in-git

• http://nathanj.github.com/gitguide/tour.html

• http://www.gitguys.com/
• A few git tips you didn't know about

• git fetch to update the known remote branches
• git checkout -t origin/branch
  • sets up a local branch tracking origin/branch
  • Alternatively: git branch --track localbranchname remotebranchname
• git config --global push.default tracking

• see http://markmcb.com/2008/09/21/multiple-remote-git-branches-with-different-local-names/
• Trick: push = localbranchname:remotebranchname in [remote "xy"]

• move changes done starting from remotes/origin/master to master to sourceforge branch

  • git rebase --onto sourceforge remotes/origin/master master

• let local sourceforge branch point to the most recent commit in master branch
  • git checkout sourceforge

  • git reset --hard master

• reset master branch to remotes/origin/master
  • git checkout master

  • git reset --hard remotes/origin/master

• Eine von beiden Dateien in einem Merge-Konflikt behalten

git format-patch and git apply are a huge hazzle under Windows. Following paramters for git am solve most of these problems:

git am --keep-cr --ignore-space-change --ignore-whitespace

• http://progit.org/book/ch7-2.html
  • $Format:$ in .gitattributes for git archive

• http://progit.org/book/ch7-2.html

• Tig: text-mode interface for git

• http://yoush.homelinux.org:8079/tech/git-svn-usage-tips
  • upstream-vc tip
• Git-svn bare mirrors « James’ SOC Blog
• Automatically Create svn authors file
• git update-ref refs/remotes/git-svn refs/remotes/origin/master (from http://rip747.wordpress.com/2009/06/17/reviving-a-git-svn-clone/)
  • should be done before each svn dcommit
• http://stackoverflow.com/questions/1880405/can-different-git-svn-clones-of-the-same-svn-repository-expect-to-be-able-to-shar/1880487#1880487
  • other svn users should interact directly with the SVN and not pusblish using git repoistory
• http://blog.oddbit.com/2010/05/pushing-git-repository-to-subversion.html
  • not as good as the upstream-vc tip
• http://blog.oddbit.com/2010/05/pushing-git-repository-to-subversion.html
  • seem sto be unneccesarily complicated
• http://kris.me.uk/2010/10/01/svn-master-with-git-mirrors.html
  • nice idea, but too much overhead. SVN can indeed sync to a bare repository. Use GIT_DIR environment variable and an exiting bare repository

• https://github.com/nirvdrum/svn2git

• git init --bare

• export GIT_DIR = .
• git svn clone with prefix svn
  • git svn clone --authors-file=path/to/authors_file --prefix=svn -s https://svn.example.org/svn/repo1
  • eventually use

    --no-follow-parent

    or

    --no-minimize-url

• create upstream-vcs branch
  • all devs may NEVER write to that branch, but they may branch or cherry-pick from it
  • updating is done by the master with SVN access
• cron job:
  • svn fetch
  • git push -q GIT_DIR resf/remots/svn/trunk:upstream-vcs
  • see: http://yoush.homelinux.org:8079/tech/git-svn-usage-tips

• http://stackoverflow.com/questions/2233590/is-there-a-way-to-make-git-remember-the-password-for-webdav-remotes
  • https://www.labkey.org/wiki/home/Documentation/page.view?name=netrc
    • file has to be called “_netrc” at Windows

• use git pull/push normally, upstream-vcs tracks the upstream changes

• Issue: mirror implies a bare repoistory
  • Quick solution: mirror and convert repo to a non-bare repository. Then, use git svn fetch. – Issue: The user has to have access to the SVN repo and the git functionality is not used any more to be in sync with SVN
• svn init has to be done with the same/similar parameters (usenrame may differ) as with the main repo
• The trick is

  git config --add remote.origin.fetch '+refs/remotes/*:refs/remotes/*'

  • Source: Samples of the |official git-svn doc.

• Git Extensions - Software for Windows
  • uses kdiff3 for diffs
• msysgit
• git4win - Windows-Client for git
• TicGit-ng istributed bug tracker based in Git
• Batch files for VCS
• gitview
• ugit: the pythonic git gui

• The Bug Genie - worse than redmine
• Diffuse Textdiff-Tool
• git ui - not continued
• LaTeX Track Changes - no files available?

• gitstat
  • Requires Web server, PHP,MySQL, perl, GeSHi, JpGraph
• GitStats
  • Creates a bunch of html files
• http://oss.oracle.com/~mason/gitstat/ gitstat by Chris Mason
• gource

• gerrit2
  • Fine-grained permissions
  • Easy code-review workflow
• gitolite fine-grained permissions for git repos
  • Managing plugin for Redmine

• gerrit2
• ReviewBoard
  • Using post-review with git

• http://aniszczyk.org/2011/05/12/git-ant-tasks-via-jgit/
• http://stackoverflow.com/questions/2974106/how-to-lookup-the-latest-git-commit-hash-from-an-ant-build-script
• http://stackoverflow.com/questions/841009/best-way-to-integrate-git-with-ant

• EGit müsste eigentlich ausreichen
• Tipp für msysgit:
  • _netrc in %HOME% (normalerweise c:\users\username)
    • Details: siehe client
  • Umgebungsvariable LANG=en
  • .gitconfig — Username setzen - http://book.git-scm.com/2_setup_and_initialization.html

  • git config --global branch.autosetuprebase always