[git-users] Commit Refactoring: Best Practice

2014-08-19 Thread Sverre Moe
What is the preferred Git best practice when it comes to commit refactoring? When I refactor some Java files in Eclipse, Git recognizes it has been renamed and places the file under Changes to be committed. I addition because the Java class file has been renamed the Class and all other classes

Re: [git-users] Commit Refactoring: Best Practice

2014-08-19 Thread Konstantin Khomoutov
On Tue, 19 Aug 2014 01:22:24 -0700 (PDT) Sverre Moe sverre@gmail.com wrote: What is the preferred Git best practice when it comes to commit refactoring? When I refactor some Java files in Eclipse, Git recognizes it has been renamed and places the file under Changes to be committed. I

[git-users] Re: Breakage in UMTSFemto GIT repository

2014-08-19 Thread Pierre-Fran├žois CLEMENT
On Friday, 8 August 2014 18:11:35 UTC+2, ab wrote: Hi all, I am trying to create a GIT clone and followed below steps 1. Set Environment Variables a. export PATH=/auto/mitg-sw/tools/debian/git/bin:/auto/mitg-sw/tools/bin:$PATH 2. Generate Keys a. ssh-keygen -t

[git-users] Review changes in a concrete line of code

2014-08-19 Thread Norike Abe
Excuse me if the terminology I use is not exactly the one used in Git. I'm not very used in this system... Imagine you suspect a line of code (or a method) in a file in your project has changed but you don't know when; and you want to check if that line has ever changed, when this happened,

[git-users] git svn unable to chdir up to '.'

2014-08-19 Thread Sebastian Fischer
I use a local git with a SVN remote server, everything works fine but after my last reboot I get the following error with everything related to git svn. unable to chdir up to '.' -- You received this message because you are subscribed to the Google Groups Git for human beings group. To

[git-users] Changes lost after Git automatic (three-way) merge

2014-08-19 Thread keyboardcat
Hi, I've been experiencing some weird merges lately, where Git's automatic three-way merge will take the wrong change. Let's say I created a branch *develop* off of *master*. Here's the situation given a line in a particular file: *develop:* line has no change *master:* line changed I am on

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

2014-08-19 Thread Etienne Pouliot
I ended up using icrond to launch my hook whenever a file in /salt/.git/logs was modified, wich fill my need. Thank you again! On Monday, August 18, 2014 6:18:11 AM UTC-4, Konstantin Khomoutov wrote: On Fri, 15 Aug 2014 07:55:36 -0700 (PDT) Etienne Pouliot etienne...@gmail.com javascript:

Re: [git-users] Review changes in a concrete line of code

2014-08-19 Thread Gergely Polonkai
git-log comes to the rescue. You can pass --since DATE to git-log, and can even give a path or file name, too. For example: git log --since '4 days' src/susp.c will display every commit in the last 4 day that modified srcsusp.c On 19 Aug 2014 15:59, Norike Abe nor...@gmail.com wrote: Excuse me

Re: [git-users] Review changes in a concrete line of code

2014-08-19 Thread Magnus Therning
On Tue, Aug 19, 2014 at 3:58 PM, Norike Abe nor...@gmail.com wrote: Excuse me if the terminology I use is not exactly the one used in Git. I'm not very used in this system... Imagine you suspect a line of code (or a method) in a file in your project has changed but you don't know when; and

Re: [git-users] Review changes in a concrete line of code

2014-08-19 Thread Dale R. Worley
From: Norike Abe nor...@gmail.com Is there a command to compare all the changes between two given commits a file has suffered, in a given set of lines of code? There are a number of Git commands to investigate problems like this, including git blame and git diff. A tool that I use is

Re: [git-users] git clean vs git status re .gitignore

2014-08-19 Thread Magnus Therning
On Tue, Aug 19, 2014 at 10:06:23PM -0400, Paul Smith wrote: One of the platforms I need to build on is Windows and we're using cmake to generate MSVC project files. MSVC allows you to build one of a small number of different types of output, such as Debug, Release, etc. Additionally, we have