summaryrefslogtreecommitdiff
path: root/Documentation/git-branch.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-08-18 16:30:11 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-08-18 16:30:11 -0700
commit0a4139b5f283ef5e817afaafd9e7e2a149220cc4 (patch)
treebb82d5f38b4677d5040ff0a7035f04366e12e4f2 /Documentation/git-branch.txt
parentpush: mention "git pull" in error message for non-fast forwards (diff)
parentsmart-http: Don't deadlock on server failure (diff)
downloadtgif-0a4139b5f283ef5e817afaafd9e7e2a149220cc4.tar.xz
Merge branch 'sp/fix-smart-http-deadlock-on-error' into maint
* sp/fix-smart-http-deadlock-on-error: smart-http: Don't deadlock on server failure
Diffstat (limited to 'Documentation/git-branch.txt')
0 files changed, 0 insertions, 0 deletions