Re: Selectively commit/publish files to GIT

2013-11-08 Thread Magnus Bäck
ring. You can use 'git log' to look for commits touching particular pathnames, making it easy to verify that a file has been eradicated. git log --all -- path/to/big-honking-file.zip -- Magnus Bäck ba...@google.com -- To unsubscribe from this list: send the line "unsubscribe git

Re: Teams of people using signed commits...

2013-06-14 Thread Magnus Bäck
onfigure Git to sign commits by default, but if you control the machine of your machines (assuming a corporate) environment you can set up a template directory for hook distribution. Again, that's only for client hooks that are okay to be circumventable. [...] -- Magnus Bäck ba...@google.com --

Re: Is there a library for monitoring a git repository for any changes?

2013-06-07 Thread Magnus Bäck
gt; repository so that I wouldn't need to write it myself? Would anyone > else be interested if I wrote it myself? 'git ls-remote'? Either run periodically or, if the monitored git is local, triggered via inotify. If you have control over the git perhaps a post-receive hook wou

Re: Workflow Help

2013-05-21 Thread Magnus Bäck
known state? - Merge from develop to the release branch. What's the benefit compared to cutting the release branch directly from develop? As another poster has pointed out, with merging instead of cherrypicking the standard Git tools will be able to do a better job at helping you tra

Re: your mail

2013-05-21 Thread Magnus Bäck
merge conflicts looks pretty good: http://gitguru.com/2009/02/22/integrating-git-with-a-visual-merge-tool/ -- Magnus Bäck ba...@google.com -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: more git weirdness (git rebase, merge conflicts

2013-03-28 Thread Magnus Bäck
l your local uncommitted changes made to tracked files while keeping local/untracked files, run "git reset --hard". If you haven't made any local commits a correctly invoked rebase (or pull) will be a trivial fast-forward. -- Magnus Bäck ba...@google.com -- To unsubscribe fro

Re: which files will have conflicts between two branches?

2013-03-28 Thread Magnus Bäck
quot;git status" output to find the files with conflicts. In a script, use "git ls-files -u" instead. -- Magnus Bäck ba...@google.com -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: merge help

2013-03-27 Thread Magnus Bäck
HEAD -- file.c file.h There are many graphical diff and merge tools that you can configure for use with Git, e.g. kdiff3 and meld. See git-difftool(1) and git-mergetool(1). [...] -- Magnus Bäck ba...@google.com -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: git branch based hook desigh

2013-03-20 Thread Magnus Bäck
ef that's about to be updated, just put a conditional in the hook. You get the name(s) of ref(s) to be updated on stdin. -- Magnus Bäck ba...@google.com -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More

Re: building git ; need suggestion

2013-03-15 Thread Magnus Bäck
h single > authentication. NO ACL If you just have two levels of access you could have two separate Gitweb sites and use Gerrit to replicate a subset of the branches to each site. You could e.g. have gitweb-dev.example.com and gitweb-maint.example.com and grant access to those sites according

Re: inotify to minimize stat() calls

2013-02-14 Thread Magnus Bäck
n Johannes Sixt's first email is broken, but I'm sure the information can be dug up.) Based on a quick look it seems GetFileAttributesEx() is still used for mingw and cygwin Git. -- Magnus Bäck ba...@google.com -- To unsubscribe from this list: send the line "unsubscribe git"

Re: Python extension commands in git - request for policy change

2012-11-28 Thread Magnus Bäck
On Tuesday, November 27, 2012 at 19:10 EST, Felipe Contreras wrote: > On Tue, Nov 27, 2012 at 3:35 PM, Magnus Bäck wrote: > > > While "constant traffic" probably overstates the issue, these are > > not theoretical problems. I recall at least three cases in the l

Re: Python extension commands in git - request for policy change

2012-11-27 Thread Magnus Bäck
onstant traffic" probably overstates the issue, these are not theoretical problems. I recall at least three cases in the last year or so where Git has seen breakage with Solaris or Mac OS X because of sed or tr incompatibilities, and I don't even read this list that thoroughly. [...

Re: how the commit ID come from in GIT?

2012-11-05 Thread Magnus Bäck
cm.com/book/en/Git-Internals-Git-Objects That description is quite detailed, and most users don't need to go that deep. -- Magnus Bäck ba...@google.com -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majo