[git-users] Detect destructive changes betweeen two file versions

2015-10-29 Thread Ivan Švaljek
Is it possible to automate an C# app using git, so I get a flag whether the changes in the new file version are destructive or non-destructive? Bonus question: is there a functionality in git to then merge those two file versions if the changes were non destructive (line addition in css or a

Re: [git-users] Git behind nginx reverse proxy

2015-10-29 Thread Péricé Robin
I want to use ssh protocole. Le mercredi 28 octobre 2015 18:00:01 UTC+1, Konstantin Khomoutov a écrit : > > On Wed, 28 Oct 2015 09:20:41 -0700 (PDT) > Péricé Robin wrote: > > > I want (if possible) to use git behind a nginx reverse proxy. This is > > my configuration. >

[git-users] want to retain my change of files, but want updated version of files.

2015-10-29 Thread nmh
I did a 1) git clone 2) git branch -b B1 3) git checkout B1 4) made few changes to file a, b, c,d 5) git commit -a 6) git review.(submitted to gerrit) Got some review commentsfor file b,c i want to make changes to files b,c 1) git checkout B1 2) made changes to b,c 3) git status shows

[git-users] To commit or not commit, a release candidate

2015-10-29 Thread Sverre Moe
I just wanted to get the lay of the land regarding peoples method of committing release candidate changes in Git. Using either automake or cmake, the release candidate is set in either configure.ac or CMakeList.txt, and thus used in RPM version and Git tag when building. When using Maven, it

Re: [git-users] Git behind nginx reverse proxy

2015-10-29 Thread Konstantin Khomoutov
On Thu, 29 Oct 2015 01:17:58 -0700 (PDT) Péricé Robin wrote: > > > I want (if possible) to use git behind a nginx reverse proxy. > > > This is my configuration. [...] > > > I have 2 virtual machines. The first one host Nginx and the > > > second host my Git repositories.

Re: [git-users] want to retain my change of files, but want updated version of files.

2015-10-29 Thread Konstantin Khomoutov
On Thu, 29 Oct 2015 01:41:23 -0700 (PDT) nmh wrote: > I did a > > 1) git clone > 2) git branch -b B1 > 3) git checkout B1 The steps 2-3 look strange. You either do `git branch B1` followed by `git checkout B1` or just `git checkout -b B1` which combines the former