summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-05-03 23:28:09 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-05-03 23:28:09 -0700
commit5dfde8715664d389de640d9475fb1678b8403596 (patch)
tree90c0f6d13b887942c98c3144ce8cfeb5b8b0db67 /xdiff
parentMerge branch 'maint' (diff)
parentRevert "fetch, pull: ask config for remote information" (diff)
downloadtgif-5dfde8715664d389de640d9475fb1678b8403596.tar.xz
Merge branch 'js/remoteconfig'
* js/remoteconfig: Revert "fetch, pull: ask config for remote information" fetch, pull: ask config for remote information builtin-push: also ask config for remote information builtin-push: make it official. Fix builtin-push to honor Push: lines in remotes file. builtin-push: resurrect parsing of Push: lines git builtin "push"
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions