Re: Summary of the problems with git pull

2014-05-07 Thread Ping Yin
Ping Yin On Mon, May 5, 2014 at 8:29 AM, Felipe Contreras felipe.contre...@gmail.com wrote: Hi, == git update == Another proposed solution is to have a new command: `git update`. This command would be similar to `git pull --ff-only` by default, but it could be configured to do merges

Re: Officially start moving to the term 'staging area'

2013-09-06 Thread Ping Yin
On Wed, Sep 4, 2013 at 2:08 PM, William Swanson swanson...@gmail.com wrote: On Thu, Aug 29, 2013 at 11:01 AM, Felipe Contreras felipe.contre...@gmail.com wrote: It has been discussed many times in the past that 'index' is not an appropriate description for what the high-level user does with

Re: Ensimag students projects, version 2013

2013-04-14 Thread Ping Yin
15 git rebase --stash, git pull --rebase --stash It seems that Ramkumar Ramachandra is working on this in his [PATCH v2 0/3] Introduce pull.autostash series Ping Yin On Mon, Apr 15, 2013 at 4:04 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Hi, Like the years before, I'm going

Re: How to setup bash completion for alias of git command

2013-01-20 Thread Ping Yin
On Sun, Jan 20, 2013 at 7:14 PM, Jonathan Nieder jrnie...@gmail.com wrote: Hi Ping, Ping Yin wrote: However, in debian (testing, wheezy), it doesn't work $ gtlg orTAB gtlg or-bash: [: 1: unary operator expected -bash: [: 1: unary operator expected Yes, I can reproduce this. git bisect

Re: How to setup bash completion for alias of git command

2013-01-12 Thread Ping Yin
On Sat, Jan 12, 2013 at 10:30 PM, Ping Yin pkufra...@gmail.com wrote: Following setup works for me in ubuntu (10.04,11.04) for a long time alias gtlg='git log' complete -o default -o nospace -F _git_log gtlg However, in debian (testing, wheezy), it doesn't work $ gtlg orTAB gtlg or-bash