summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-05-11 11:18:43 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-05-11 11:18:43 -0700
commit07e74b0da2896ffa6acb5c33f56d7266b35b7ac9 (patch)
treebe3f24134f5956774c7d5407231a31bab33d5616 /diff.h
parentMerge branch 'js/fast-import-test-9300' into maint (diff)
parentFix httpd tests that broke when non-ff push advice changed (diff)
downloadtgif-07e74b0da2896ffa6acb5c33f56d7266b35b7ac9.tar.xz
Merge branch 'ct/advise-push-default' into maint
The cases "git push" fails due to non-ff can be broken into three categories; each case is given a separate advise message. By Christopher Tiwald (2) and Jeff King (1) * ct/advise-push-default: Fix httpd tests that broke when non-ff push advice changed clean up struct ref's nonfastforward field push: Provide situational hints for non-fast-forward errors
Diffstat (limited to 'diff.h')
0 files changed, 0 insertions, 0 deletions