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

[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 comment in php)?

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

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

[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. 
> > 
> > 
> > <
> https://lh3.googleusercontent.com/-1nAfkrNG_zo/VjDz5KXcjQI/IPY/esyj1BQxWnA/s1600/git-behind-reverse-proxy.png>
>  
>
> > 
> > 
> > I have 2 virtual machines. The first one host Nginx and the second 
> > host my Git repositories. I can access to git repositories usig Git 
> > VM dynamic ip (84.39.XX.XX), but it would be awesome if I can do *git 
> > clone* (etc ...) on* scm.domain.fr* instead of the dynamic-ip (of 
> > course I need this because I don't want everybody to know my Git VM 
> > ip...). 
> > 
> > Is this possible with a Nginx reverse-proxy ? 
>
> What protocol are you using when doing `git clone` from your Git VM? 
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

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

[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 changed files as b,c only.


before commiting i want to update the B1 with latest 
changes.

what command should i use so that..
i get latest version of files a,b,c,d and i do not lose my changes.

i tried 

1) git stash ..
2) git checkout filename
3) git stash pop

is this a right way ?
My doubt is .. if i do git stash .. what will it stash .. 
either only latest changes of files b,c or all changes of files a,b,c,d???

Please guide.










-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

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

[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 gets the following commits each time I release a new 
version (stable or RC).
[maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare release v1.0.1


>From some of my peers I have seen some frustration in having to bump up the 
version for each release candidate manually. Also specially when there is 
no source code change, but a change in a static library and we need a new 
release of all projects that uses it.

change release candidate
commit change
build new release candidate
fixes..
fixes.
change release candidate
commit change
build new release candidate
change release candidate to release
commit change
build new release

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

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

[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. I can access to git repositories
> > > usig Git VM dynamic ip (84.39.XX.XX), but it would be awesome if
> > > I can do *git clone* (etc ...) on* scm.domain.fr* instead of the
> > > dynamic-ip (of course I need this because I don't want everybody
> > > to know my Git VM ip...). 
> > > 
> > > Is this possible with a Nginx reverse-proxy ? 
> >
> > What protocol are you using when doing `git clone` from your Git
> > VM? 
> >
> I want to use ssh protocole.

Then the "stream proxy" module [1] appears to be the thing you want to
look at: it allows proxying of arbitrary TCP traffic, so basically you'd
want to set it up so that it proxies connections to 22/TCP to your VM.

1. http://nginx.org/en/docs/stream/ngx_stream_proxy_module.html

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

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

[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 two steps.

> 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 changed files as b,c only.
> 
> 
> before commiting i want to update the B1 with latest 
> changes.
> 
> what command should i use so that..

That's what `git rebase` is for.

You did not show us which branch B1 was forked off, so let's assume
that was "master".  If yes, you'd do:

  git fetch origin
  git rebase origin/master B1

The `git rebase` command will first reset your B1 for it to look like
the up-to-date state of "master", and then replay your changes on top
of it.  If there will be any conficts, `git rebase` will ask you to
resolve them and hint on how to proceed further so pay close attention
to what it tells to you.

> i get latest version of files a,b,c,d and i do not lose my changes.
> 
> i tried 
> 
> 1) git stash ..
> 2) git checkout filename
> 3) git stash pop
> 
> is this a right way ?

I doubt this.

> My doubt is .. if i do git stash .. what will it stash .. 
> either only latest changes of files b,c or all changes of files
> a,b,c,d???

The `git stash` saves any *uncommitted* changes.
Uncommitted means whatever changes are there compared to HEAD.
There are two places where such changes may be present: the index and
the work tree, and so `git stash` actually saves these two states: the
state of the index and the state of the work tree.
(Sometimes it may be useful to also consider untracked files as local
changes, and `git stash` can be told to save them as well.)

In contrast, `git rebase` operate on commits.  You commit your work and
them make `git rebase` arrange for that work to be relocated on top of
the current state of the branch your current branch has been originally
forked off.

Please also note that you're talking about Gerrit, and Gerrit is not
Git in that it might put additional constraints on your workflow --
that is, it might expect you to manage your changes in some
Gerrit-friently way.  Hence we here deal with Git and not Gerrit, I'd
ask your question on some Gerrit support channel to get more sensible
help.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.