diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-04-07 14:32:50 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-04-07 14:32:50 -0700 |
commit | 4d35924e3ac2e3022dd7595afe48334e7a794fb4 (patch) | |
tree | 39681a136e126cd5025aa78349d9db6d97ccd17f /notes.h | |
parent | Merge branch 'mm/status-during-revert' (diff) | |
parent | remote.c: introduce branch.<name>.pushremote (diff) | |
download | tgif-4d35924e3ac2e3022dd7595afe48334e7a794fb4.tar.xz |
Merge branch 'rr/triangle'
Support "pull from one place, push to another place" workflow
better by introducing remote.pushdefault (overrides the "origin"
thing) and branch.*.pushremote (overrides the branch.*.remote).
* rr/triangle:
remote.c: introduce branch.<name>.pushremote
remote.c: introduce remote.pushdefault
remote.c: introduce a way to have different remotes for fetch/push
t5516 (fetch-push): drop implicit arguments from helper functions
t5516 (fetch-push): update test description
remote.c: simplify a bit of code using git_config_string()
Diffstat (limited to 'notes.h')
0 files changed, 0 insertions, 0 deletions