On Sat, Nov 08, 2014 at 06:18:55AM -0500, Jeff King wrote: > On Fri, Nov 07, 2014 at 02:58:17PM +0100, Johannes Schindelin wrote: > > > Under certain circumstances, it makes a *lot* of sense to allow pushing > > into the current branch. For example, when two machines with different > > Operating Systems are required for testing, it makes much more sense to > > synchronize between working directories than having to go via a third > > server. > > FWIW, I do this without a third server (and without resorting to pull), > with: > > host1$ git push host2 master:refs/remotes/host1/master > host2$ git merge host1/master > > You can even set up a push refspec to make "git push host2" do the right > thing.
I do something similar, but it's inconvenient when the repo you're pushing into is $HOME, since you have to type something like "exec zsh -l" in order to fix things up. > That being said, I do like the premise of your patch, as it eliminates > the extra step on the remote side (which is not that big a deal in > itself, but when you realize that host2 _did_ have some changes on it, > then you end up doing the merge there, when in general I'd prefer to do > all the work on host1 via "git pull"). I agree. This is very useful. -- brian m. carlson / brian with sandals: Houston, Texas, US +1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187
signature.asc
Description: Digital signature
