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

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 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

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

2012-09-04 Thread Mauro
On 4 September 2012 14:44, Antony Male antony.m...@gmail.com wrote: On Monday, 3 September 2012 21:53:28 UTC+1, Mauro Sanna wrote: On 3 September 2012 19:45, Antony Male anton...@gmail.com wrote: On Monday, 3 September 2012 18:33:03 UTC+1, Mauro Sanna wrote: On 3 September 2012 18:56

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

2012-09-05 Thread Mauro
On 5 September 2012 00:49, Antony Male antony.m...@gmail.com wrote: On Tuesday, 4 September 2012 21:42:29 UTC+1, Mauro Sanna wrote: On 4 September 2012 14:44, Antony Male anton...@gmail.com wrote: On Monday, 3 September 2012 21:53:28 UTC+1, Mauro Sanna wrote: On 3 September 2012 19:45

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

2012-09-05 Thread Mauro
On 5 September 2012 15:19, PJ Weisberg pjweisb...@gmail.com wrote: On Tuesday, September 4, 2012, Mauro mrsan...@gmail.com wrote: There is a way now to make a fast-forward merge? Or I must delete brand devel and recreate? Thanks for your answers and your patience. Just merge master

[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

[git-users] gitignore ignored?

2013-09-27 Thread Mauro Sanna
Hello. My .gitignore is: *.iws *Db.properties *Db.script .settings stacktrace.log /*.zip /plugin.xml /*.log /*DB.* /cobertura.ser .DS_Store /target/ /out/ /web-app/plugins /web-app/WEB-INF/classes /.link_to_grails_plugins/ /target-eclipse/ When I push my commits I see target and its subdirs in