summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-07 14:32:50 -0700
committerJunio C Hamano <gitster@pobox.com>2013-04-07 14:32:50 -0700
commit4d35924e3ac2e3022dd7595afe48334e7a794fb4 (patch)
tree39681a136e126cd5025aa78349d9db6d97ccd17f /Documentation/diff-options.txt
parente64734b6a0ffabdbf027cfee865a6cae567e2199 (diff)
parent9f765ce62fd2d5159a3dc7f73abe30a3fbef08f7 (diff)
downloadgit-4d35924e3ac2e3022dd7595afe48334e7a794fb4.tar.gz
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 'Documentation/diff-options.txt')
0 files changed, 0 insertions, 0 deletions