Re: Easy Non-Fast-Forward Pushes

2015-03-04 Thread Junio C Hamano
Lasse Kliemann writes: > 1. Try pushing to origin/master. If it works, fine. If not, goto 2. > > 2. Push to the appropriate personal branch. I wonder what happens to this user _after_ that change gets integrated on the project side. Presumably somebody picks up the change from the "personal bra

Re: Easy Non-Fast-Forward Pushes

2015-03-01 Thread Lasse Kliemann
Stefan Beller writes: > So maybe you create a bash alias for > alias gitup='git push origin HEAD:${USER}/$(date -Iseconds)' > which would push your current tip of the repository to the remote with > quite a unique name. > > Then you could also do a "git commit -a && gitup" to push your changes >

Re: Easy Non-Fast-Forward Pushes

2015-02-27 Thread Junio C Hamano
Lasse Kliemann writes: > As far as I understand, a push will always modify (or add) a ref in the > remote repository. When pushing to branch B, then the ref pointing to the > last commit in this branch will be moved, provided that this can be done in > a fast-forward way. Otherwise the push will

Re: Easy Non-Fast-Forward Pushes

2015-02-27 Thread Stefan Beller
On Fri, Feb 27, 2015 at 8:20 AM, Lasse Kliemann wrote: > As far as I understand, a push will always modify (or add) a ref in the > remote repository. When pushing to branch B, then the ref pointing to the > last commit in this branch will be moved, provided that this can be done in > a fast-forwar

Easy Non-Fast-Forward Pushes

2015-02-27 Thread Lasse Kliemann
As far as I understand, a push will always modify (or add) a ref in the remote repository. When pushing to branch B, then the ref pointing to the last commit in this branch will be moved, provided that this can be done in a fast-forward way. Otherwise the push will fail. The following options exis