[git-users] Re: [PATCH] build: add default configuration

2013-09-21 Thread David Aguilar
Felipe Contreras felipe.contre...@gmail.com wrote: I know 'git ci' is perfectly fine shortcut to 'git commit'. Either way, it doesn't matter. Even if we agree that /etc/gitconfig.d is what we want, or we add an /usr/share/git/config, Junio is not going to apply any patch, even if it's what most

[git-users] Re: [PATCH] build: add default configuration

2013-09-21 Thread Felipe Contreras
On Sat, Sep 21, 2013 at 1:33 AM, David Aguilar dav...@gmail.com wrote: Felipe Contreras felipe.contre...@gmail.com wrote: I know 'git ci' is perfectly fine shortcut to 'git commit'. Either way, it doesn't matter. Even if we agree that /etc/gitconfig.d is what we want, or we add an

[git-users] git rebase keeps giving the conflict

2013-09-21 Thread dexter ietf
hi, i cloned a new tree, made changes to file readme.txt meantime readme.txt in the remote has changed at the same location. when i do a git pull i got merge conflicts, i resolved the conflicts and did a 'git commit' now i did git rebase, somehow i'm seeing the conflict again, now i fixed the

[git-users] git rebase after a pull

2013-09-21 Thread dexter ietf
is it required to do a git pull before doing a git push. and is it required to do a git rebase after git pull just before git push. one of my git repo mandates the above wondering if there is a valid reason for this. -dexter -- You received this message because you are subscribed to the Google

Re: [git-users] git rebase after a pull

2013-09-21 Thread Philip Oakley
Dexter, It is not required that you Pull before a push. The pull is a combination of 'fetch' and 'merge'. So you can fetch the remote content into it's own area of storage, and then compare what you have with what they have - gitk branch is useful here. (the '' means return immediately, so

[git-users] assume unchanged bit operations

2013-09-21 Thread Rostislav Krasny
Hi, Git allows to set the assume unchanged bit to a tracking file. It helpfull for example when you work with Eclipse Java projects and don't want your local changes in the project configuration files to be tracked by git. Unfortunatelly I didn't find a convenient way of listing files with

Re: [git-users] assume unchanged bit operations

2013-09-21 Thread Philip Oakley
In some case the use of the .gitignore to identify which types of files are not relevant is better. That said, git does not (yet) have any mechanism for marking files as 'precious' but untracked. It takes the view that precious files should be tracked Philip - Original Message -

Re: [git-users] assume unchanged bit operations

2013-09-21 Thread Rostislav Krasny
On Saturday, September 21, 2013 5:20:12 PM UTC+3, Philip Oakley wrote: In some case the use of the .gitignore to identify which types of files are not relevant is better. This is not the case. That said, git does not (yet) have any mechanism for marking files as 'precious' but

Re: [git-users] git rebase after a pull

2013-09-21 Thread Felipe Contreras
On Sat, Sep 21, 2013 at 8:06 AM, dexter ietf dexter.i...@gmail.com wrote: is it required to do a git pull before doing a git push. and is it required to do a git rebase after git pull just before git push. one of my git repo mandates the above wondering if there is a valid reason for this.

[git-users] Re: git5 submit bypassing tap

2013-09-21 Thread Thomas Ferris Nicolaisen
On Friday, September 20, 2013 11:34:14 AM UTC+2, Rajnish Kumar wrote: Hi, Just tried submitting a CL using TAP, which ran 422 test cases and had 7 failures. These failures have been verified to be caused by a recent change. Now I wish to submit the CL without going through TAP to avoid