[git-users] Show changes in merge commit

2014-08-18 Thread mgd
When calling git show on a simple commit (i.e. not a merge commit) git will show the commit message and the modified files including their diffs. Adding "--name-only" will list only the file names of the modified files. On the other hand, when running "git show" against a merge commit, thin

Re: [git-users] asking some question

2014-08-18 Thread Konstantin Khomoutov
On Mon, 18 Aug 2014 05:27:18 -0700 (PDT) eamira...@gmail.com wrote: > so we have a master source and some different sources > for different projectsfor example our bank organization project > has some parts different from our university project > 1.Could we have different branches for every

[git-users] asking some question

2014-08-18 Thread eamiraslg
I'm new to git.I'm not a professional person in programming.I work in R & D group and I'm just researching about source control systems.our programming group use VSS(sourcesafe) but I can see that they have encountered many problems.so I want to help them to switch to git .I know about git featu

Re: [git-users] post-merge hook not running

2014-08-18 Thread Konstantin Khomoutov
On Fri, 15 Aug 2014 07:55:36 -0700 (PDT) Etienne Pouliot wrote: > > > I'm trying to get my post-merge hook to run but I can't get it to > > > work. > > [...] > > > #git pull [...] > > The merge did not happen because `git merge` (which was run as a > > part of the `git pull` work flow) perfo

[git-users] Measures to take regarding large binary files in a Git repository

2014-08-18 Thread fabian . schmied
Hi, (Scenario at the top, concrete questions below.) I'm in the progress of migrating an SVN repository to Git, including history, using "git svn". The SVN repository currently contains a number of large (data) files: - five binary files of 100 MB to 400 MB, with up to 17 revisions, - eleven bi