[git-users] Re: How do I update a parent repository's history to reflect changes made to a submodule's history done using 'git branch-filter'?

2012-09-03 Thread Thomas Ferris Nicolaisen
On Monday, September 3, 2012 7:18:14 AM UTC+2, Walt Destler wrote: I have two Git repositories which I'll call *A* and *B*. Repo *B* happens to be a submodule of Repo *A*. Repo *B* is chock full of binary files that I'd like to wipe from history. (These are private repos so I won't be

[git-users] .gitignore and branches issues

2012-09-03 Thread mem
While checkout to master branch, I got: Error: The following untracked working tree files would be overwritten by checkout: nbproject/private/config.properties nbproject/private/private.properties nbproject/private/private.xml nbproject/project.properties nbproject/project.xml Please move

Re: [git-users] .gitignore and branches issues

2012-09-03 Thread Konstantin Khomoutov
On Mon, 3 Sep 2012 02:29:12 -0700 (PDT) mem talofo.l...@gmail.com wrote: While checkout to master branch, I got: Error: The following untracked working tree files would be overwritten by checkout: nbproject/private/config.properties nbproject/private/private.properties

[git-users] Why git merge always ask for a commit message?

2012-09-03 Thread Mauro Sanna
I have two branches: devel and master. I'm using git as repository for some applications. Usually I do changes under devel branch, commit and push. Then I do a git checkout master, git merge devel and push and all done. I always have done this but now, in a new application, when I do git merge

Re: [git-users] .gitignore and branches issues

2012-09-03 Thread mem
On Sep 3, 2012, at 11:34 , Konstantin Khomoutov wrote: On Mon, 3 Sep 2012 02:29:12 -0700 (PDT) mem talofo.l...@gmail.com wrote: While checkout to master branch, I got: Error: The following untracked working tree files would be overwritten by checkout: nbproject/private/config.properties

[git-users] Re: Efficient project architecture with git

2012-09-03 Thread Thomas Ferris Nicolaisen
On Friday, August 31, 2012 10:46:12 AM UTC+2, takku divakar wrote: Hi Thomas Ferris Nicolaisen Recently i am attended an interview , the interview panel asked me let you explain the current project architecture. i am given some explanation but those are not satisfied. Please tell me the

Re: [git-users] Trying to add a submodule which still exists on the index (unable to remove the submodule from there)

2012-09-03 Thread Łukasz Siwiński
I haven't tried submodules yet, but did You commited your submodule? Command: git add something/ adds your files (submodules?) only to stage index. If You want to commit files added to stage index, You should commit them with: git commit -m your commit message Pozdrawiam, -- Łukasz Siwiński

[git-users] Re: Why git merge always ask for a commit message?

2012-09-03 Thread Antony Male
On Monday, 3 September 2012 12:19:11 UTC+1, Mauro Sanna wrote: Then I do a git checkout master, git merge devel and push and all done. I always have done this but now, in a new application, when I do git merge devel into master it asks me for a commit message. In version 1.7.10, git started

Re: [git-users] Re: Why git merge always ask for a commit message?

2012-09-03 Thread Mauro
On 3 September 2012 18:13, Antony Male antony.m...@gmail.com wrote: On Monday, 3 September 2012 12:19:11 UTC+1, Mauro Sanna wrote: Then I do a git checkout master, git merge devel and push and all done. I always have done this but now, in a new application, when I do git merge devel into

Re: [git-users] Re: Why git merge always ask for a commit message?

2012-09-03 Thread Antony Male
On Monday, 3 September 2012 17:32:46 UTC+1, Mauro Sanna wrote: On 3 September 2012 18:13, Antony Male anton...@gmail.com javascript: wrote: On Monday, 3 September 2012 12:19:11 UTC+1, Mauro Sanna wrote: Then I do a git checkout master, git merge devel and push and all done. I

[git-users] Unified diff with word or character coloring

2012-09-03 Thread David Erickson
Hi is there any way to achieve word or character-level diff coloring when using the unified diff (line by line) output format? In particular I would like to have an output format that continues to work within git-gui, but be able to quickly visually identify which words/characters have changed

Re: [git-users] Re: Why git merge always ask for a commit message?

2012-09-03 Thread Mauro
On 3 September 2012 18:56, Antony Male antony.m...@gmail.com wrote: On Monday, 3 September 2012 17:32:46 UTC+1, Mauro Sanna wrote: On 3 September 2012 18:13, Antony Male anton...@gmail.com wrote: On Monday, 3 September 2012 12:19:11 UTC+1, Mauro Sanna wrote: Then I do a git checkout

Re: [git-users] Re: Why git merge always ask for a commit message?

2012-09-03 Thread Antony Male
On Monday, 3 September 2012 18:33:03 UTC+1, Mauro Sanna wrote: On 3 September 2012 18:56, Antony Male anton...@gmail.com javascript: wrote: On Monday, 3 September 2012 17:32:46 UTC+1, Mauro Sanna wrote: On 3 September 2012 18:13, Antony Male anton...@gmail.com wrote: On Monday, 3

[git-users] Automatic repacking when cloning

2012-09-03 Thread Haasip Satang
Hi all, I'm having a question regarding the packs and the repacking of those during cloning. I'm migrating a big repository which after initial commit of all files contains only one pack file of 120MB in size (about 800 extracted). On this big repo I created various subtree branches so I

[git-users] Re: Automatic repacking when cloning

2012-09-03 Thread Haasip Satang
One more note...If I execute the following it repacks everything on client side and drops the big pack and I end up with the small pack I want to have: git pack-refs --prune git reflog expire --all git repack -a -d -f -l So this results in exactly what cloning via file:// would give me right

Re: [git-users] Automatic repacking when cloning

2012-09-03 Thread Konstantin Khomoutov
On Mon, 3 Sep 2012 10:51:30 -0700 (PDT) Haasip Satang haasip.sat...@googlemail.com wrote: I'm having a question regarding the packs and the repacking of those during cloning. [...] On this big repo I created various subtree branches so I can clone some of the folders individually (without

Re: [git-users] Automatic repacking when cloning

2012-09-03 Thread Philip Oakley
From: Konstantin Khomoutov flatw...@users.sourceforge.net Sent: Monday, September 03, 2012 7:29 PM On Mon, 3 Sep 2012 10:51:30 -0700 (PDT) Haasip Satang haasip.sat...@googlemail.com wrote: I'm having a question regarding the packs and the repacking of those during cloning. [...] On this big

Re: [git-users] Re: Why git merge always ask for a commit message?

2012-09-03 Thread Mauro
On 3 September 2012 19:45, Antony Male antony.m...@gmail.com wrote: On Monday, 3 September 2012 18:33:03 UTC+1, Mauro Sanna wrote: On 3 September 2012 18:56, Antony Male anton...@gmail.com wrote: On Monday, 3 September 2012 17:32:46 UTC+1, Mauro Sanna wrote: On 3 September 2012 18:13,