aboutsummaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorNick Hengeveld <nickh@reactrix.com>2006-03-10 20:18:01 -0800
committerJunio C Hamano <junkio@cox.net>2006-03-10 23:01:48 -0800
commitbaa7b67d091acf4c666e79e386712bd5ea79326c (patch)
tree852116fd35adf81371c03bc50abd272ba2c61da4 /git-merge-one-file.sh
parent5241bfe6d1593ad775dd79a5f598f66f479968b5 (diff)
downloadgit-baa7b67d091acf4c666e79e386712bd5ea79326c.tar.gz
git-baa7b67d091acf4c666e79e386712bd5ea79326c.tar.xz
HTTP slot reuse fixes
Incorporate into http-push a fix related to accessing slot results after the slot was reused, and fix a case in run_active_slot where a finished slot wasn't detected if the slot was reused. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions