Re: [ITCH] pull.default

2013-04-13 Thread Ramkumar Ramachandra
Junio C Hamano wrote: > I think you can shrink and enhance the above repertoire at the same > time by separating "do I want to have stash and stash pop around" > bit into an orthogonal axis. The other orthogonal axes are "Under > what condition do I integrate the work from the upstream?" (e.g. > "

Re: [ITCH] pull.default

2013-03-18 Thread Ramkumar Ramachandra
Junio C Hamano wrote: > Ramkumar Ramachandra writes: > >> I usually use `git fetch`, inspect state, and then merge/ rebase >> accordingly. Unfortunately, this is very sub-optimal as I can >> automate this 80% of the time. I want to be able to decide what to do >> on a repository-specific basis,

Re: [ITCH] pull.default

2013-03-18 Thread Junio C Hamano
Ramkumar Ramachandra writes: > I usually use `git fetch`, inspect state, and then merge/ rebase > accordingly. Unfortunately, this is very sub-optimal as I can > automate this 80% of the time. I want to be able to decide what to do > on a repository-specific basis, and hence propose a pull.defa